Skip to content

Commit b64dcf8

Browse files
committed
Fix the name violation in apiextensions.k8s.io/v1,CustomResourceConversion, remove the failures file
1 parent 2adb95c commit b64dcf8

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

Diff for: hack/.fieldname_docs_failures

-1
This file was deleted.

Diff for: hack/verify-fieldname-docs.sh

+3-9
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,10 @@ find_files() {
5656

5757
versioned_api_files=$(find_files) || true
5858

59-
failure_file="${KUBE_ROOT}/hack/.fieldname_docs_failures"
60-
failing_groups=()
61-
while IFS='' read -r line; do failing_groups+=("${line}"); done < <(cat "${failure_file}")
62-
6359
for file in ${versioned_api_files}; do
64-
package="${file%"/types.go"}"
65-
if ! kube::util::array_contains "${package}" "${failing_groups[@]}"; then
66-
echo "Checking ${package}"
67-
${fieldnamedocscheck} -s "${file}" || result=$?
68-
fi
60+
package="${file%"/types.go"}"
61+
echo "Checking ${package}"
62+
${fieldnamedocscheck} -s "${file}" || result=$?
6963
done
7064

7165
exit ${result}

Diff for: staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ type CustomResourceDefinitionSpec struct {
7474
// CustomResourceConversion describes how to convert different versions of a CR.
7575
type CustomResourceConversion struct {
7676
// strategy specifies how custom resources are converted between versions. Allowed values are:
77-
// - `None`: The converter only change the apiVersion and would not touch any other field in the custom resource.
78-
// - `Webhook`: API Server will call to an external webhook to do the conversion. Additional information
77+
// - `"None"`: The converter only change the apiVersion and would not touch any other field in the custom resource.
78+
// - `"Webhook"`: API Server will call to an external webhook to do the conversion. Additional information
7979
// is needed for this option. This requires spec.preserveUnknownFields to be false, and spec.conversion.webhook to be set.
8080
Strategy ConversionStrategyType `json:"strategy" protobuf:"bytes,1,name=strategy"`
8181

82-
// webhook describes how to call the conversion webhook. Required when `strategy` is set to `Webhook`.
82+
// webhook describes how to call the conversion webhook. Required when `strategy` is set to `"Webhook"`.
8383
// +optional
8484
Webhook *WebhookConversion `json:"webhook,omitempty" protobuf:"bytes,2,opt,name=webhook"`
8585
}

0 commit comments

Comments
 (0)