Merge pull request #77 from tssurya/update-api-approved-annotation

Leverage kubebuilder annotations generator

Author: k8s-ci-robot

apis/v1alpha1/adminnetworkpolicy_types.go

@@ -30,6 +30,7 @@ import (
 // +kubebuilder:printcolumn:name="Priority",type=string,JSONPath=".spec.priority"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:metadata:annotations="api-approved.kubernetes.io=https://github.com/kubernetes/enhancements/pull/2522"
 // AdminNetworkPolicy is  a cluster level resource that is part of the
 // AdminNetworkPolicy API.
 type AdminNetworkPolicy struct {

apis/v1alpha1/baselineadminnetworkpolicy_types.go

@@ -25,7 +25,7 @@ import (
 // +kubebuilder:resource:shortName=banp,scope=Cluster
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
+// +kubebuilder:metadata:annotations="api-approved.kubernetes.io=https://github.com/kubernetes/enhancements/pull/2522"
 // BaselineAdminNetworkPolicy is a cluster level resource that is part of the
 // AdminNetworkPolicy API.
 type BaselineAdminNetworkPolicy struct {

bin/golangci-lint

@@ -3,7 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    api-approved.kubernetes.io: https://github.com/kubernetes/enhancements/pull/2522
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
   name: adminnetworkpolicies.policy.networking.k8s.io
 spec:
@@ -934,8 +935,8 @@ spec:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct
                     use as an array at the field path .status.conditions.  For example,
-                    type FooStatus struct{ // Represents the observations of a foo's
-                    current state. // Known .status.conditions.type are: \"Available\",
+                    \n type FooStatus struct{ // Represents the observations of a
+                    foo's current state. // Known .status.conditions.type are: \"Available\",
                     \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
                     // +listType=map // +listMapKey=type Conditions []metav1.Condition
                     `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"

config/crd/bases/policy.networking.k8s.io_adminnetworkpolicies.yaml

@@ -3,7 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    api-approved.kubernetes.io: https://github.com/kubernetes/enhancements/pull/2522
+    controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
   name: baselineadminnetworkpolicies.policy.networking.k8s.io
 spec:
@@ -906,8 +907,8 @@ spec:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct
                     use as an array at the field path .status.conditions.  For example,
-                    type FooStatus struct{ // Represents the observations of a foo's
-                    current state. // Known .status.conditions.type are: \"Available\",
+                    \n type FooStatus struct{ // Represents the observations of a
+                    foo's current state. // Known .status.conditions.type are: \"Available\",
                     \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
                     // +listType=map // +listMapKey=type Conditions []metav1.Condition
                     `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"

config/crd/bases/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml

@@ -6,21 +6,12 @@ resources:
 - bases/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge:
+# patchesStrategicMerge:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 #- patches/webhook_in_adminnetworkpolicies.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
-# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
-# patches here are for enabling the CA injection for each CRD
-#- patches/cainjection_in_adminnetworkpolicies.yaml
-#+kubebuilder:scaffold:crdkustomizecainjectionpatch
-
-# [API-APPROVED] To enable the CRD, we need to patch the api-approved annotation
-- patches/apiapproved_annotation_in_baselineadminnetworkpolicies.yaml
-- patches/apiapproved_annotation_in_adminnetworkpolicies.yaml
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml