github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix the name violation in apiextensions.k8s.io/v1,CustomResourceConversion, remove the failures file

Browse Source
This commit is contained in:
Hao Ruan 2023-01-19 22:08:29 +08:00
parent 2adb95c376
commit b64dcf862d
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.fieldname_docs_failures
View File

@ -1 +0,0 @@
./staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1

12
hack/verify-fieldname-docs.sh
View File

@ -56,16 +56,10 @@ find_files() {
versioned_api_files=$(find_files) || true versioned_api_files=$(find_files) || true
failure_file="${KUBE_ROOT}/hack/.fieldname_docs_failures"
failing_groups=()
while IFS='' read -r line; do failing_groups+=("${line}"); done < <(cat "${failure_file}")
for file in ${versioned_api_files}; do for file in ${versioned_api_files}; do
package="${file%"/types.go"}" package="${file%"/types.go"}"
if ! kube::util::array_contains "${package}" "${failing_groups[@]}"; then echo "Checking ${package}"
echo "Checking ${package}" ${fieldnamedocscheck} -s "${file}" || result=$?
${fieldnamedocscheck} -s "${file}" || result=$?
fi
done done
exit ${result} exit ${result}

6
staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go
View File

@ -74,12 +74,12 @@ type CustomResourceDefinitionSpec struct {
// CustomResourceConversion describes how to convert different versions of a CR. // CustomResourceConversion describes how to convert different versions of a CR.
type CustomResourceConversion struct { type CustomResourceConversion struct {
// strategy specifies how custom resources are converted between versions. Allowed values are: // strategy specifies how custom resources are converted between versions. Allowed values are:
// - `None`: The converter only change the apiVersion and would not touch any other field in the custom resource. // - `"None"`: The converter only change the apiVersion and would not touch any other field in the custom resource.
// - `Webhook`: API Server will call to an external webhook to do the conversion. Additional information // - `"Webhook"`: API Server will call to an external webhook to do the conversion. Additional information
// is needed for this option. This requires spec.preserveUnknownFields to be false, and spec.conversion.webhook to be set. // is needed for this option. This requires spec.preserveUnknownFields to be false, and spec.conversion.webhook to be set.
Strategy ConversionStrategyType `json:"strategy" protobuf:"bytes,1,name=strategy"` Strategy ConversionStrategyType `json:"strategy" protobuf:"bytes,1,name=strategy"`
// webhook describes how to call the conversion webhook. Required when `strategy` is set to `Webhook`. // webhook describes how to call the conversion webhook. Required when `strategy` is set to `"Webhook"`.
// +optional // +optional
Webhook *WebhookConversion `json:"webhook,omitempty" protobuf:"bytes,2,opt,name=webhook"` Webhook *WebhookConversion `json:"webhook,omitempty" protobuf:"bytes,2,opt,name=webhook"`
} }