Merge pull request #209 from tssurya/update-conditions-kubebuilder-ma…

…rker Add kubebuilder syntax for status.conditions
kubernetes-sigs · Mar 17, 2024 · e1ce2d7 · e1ce2d7
2 parents d48faee + d6cc8ad
commit e1ce2d7
Show file tree

Hide file tree

Showing 32 changed files with 1,904 additions and 2 deletions.
diff --git a/apis/v1alpha1/adminnetworkpolicy_types.go b/apis/v1alpha1/adminnetworkpolicy_types.go
@@ -47,7 +47,11 @@ type AdminNetworkPolicy struct {
 
 // AdminNetworkPolicyStatus defines the observed state of AdminNetworkPolicy.
 type AdminNetworkPolicyStatus struct {
-	Conditions []metav1.Condition `json:"conditions"`
+	// +patchMergeKey=type
+	// +patchStrategy=merge
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions" patchStrategy:"merge" patchMergeKey:"type"`
 }
 
 // AdminNetworkPolicySpec defines the desired state of AdminNetworkPolicy.

diff --git a/apis/v1alpha1/baselineadminnetworkpolicy_types.go b/apis/v1alpha1/baselineadminnetworkpolicy_types.go
@@ -44,7 +44,11 @@ type BaselineAdminNetworkPolicy struct {
 // BaselineAdminNetworkPolicyStatus defines the observed state of
 // BaselineAdminNetworkPolicy.
 type BaselineAdminNetworkPolicyStatus struct {
-	Conditions []metav1.Condition `json:"conditions"`
+	// +patchMergeKey=type
+	// +patchStrategy=merge
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions" patchStrategy:"merge" patchMergeKey:"type"`
 }
 
 // BaselineAdminNetworkPolicySpec defines the desired state of

diff --git a/config/crd/experimental/policy.networking.k8s.io_adminnetworkpolicies.yaml b/config/crd/experimental/policy.networking.k8s.io_adminnetworkpolicies.yaml
@@ -1242,6 +1242,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
             required:
             - conditions
             type: object

diff --git a/config/crd/experimental/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml b/config/crd/experimental/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml
@@ -1215,6 +1215,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
             required:
             - conditions
             type: object

diff --git a/config/crd/standard/policy.networking.k8s.io_adminnetworkpolicies.yaml b/config/crd/standard/policy.networking.k8s.io_adminnetworkpolicies.yaml
@@ -996,6 +996,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
             required:
             - conditions
             type: object

diff --git a/config/crd/standard/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml b/config/crd/standard/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml
@@ -969,6 +969,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
             required:
             - conditions
             type: object

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -56,18 +56,26 @@ readonly APIS_PKG=sigs.k8s.io/network-policy-api
 readonly API_DIR=${APIS_PKG}/apis/v1alpha1
 readonly CLIENTSET_NAME=versioned
 readonly CLIENTSET_PKG_NAME=clientset
+readonly APPLYCONFIG_PKG_NAME=applyconfiguration
 
 readonly COMMON_FLAGS="${VERIFY_FLAG:-} --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.generatego.txt"
 
 echo "Generating CRDs"
 go run ./pkg/generator
 
+echo "Generating applyconfig at ${OUTPUT_PKG}/${APPLYCONFIG_PKG_NAME}"
+go run k8s.io/code-generator/cmd/applyconfiguration-gen \
+--input-dirs "${API_DIR}" \
+--output-package "${OUTPUT_PKG}/${APPLYCONFIG_PKG_NAME}" \
+${COMMON_FLAGS}
+
 echo "Generating clientset at ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME}"
 go run k8s.io/code-generator/cmd/client-gen \
 --clientset-name "${CLIENTSET_NAME}" \
 --input-base "" \
 --input "${API_DIR}" \
 --output-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME}" \
+--apply-configuration-package "${OUTPUT_PKG}/${APPLYCONFIG_PKG_NAME}" \
 ${COMMON_FLAGS}
 
 echo "Generating listers at ${OUTPUT_PKG}/listers"

diff --git a/pkg/client/applyconfiguration/apis/v1alpha1/adminnetworkpolicy.go b/pkg/client/applyconfiguration/apis/v1alpha1/adminnetworkpolicy.go
diff --git a/pkg/client/applyconfiguration/apis/v1alpha1/adminnetworkpolicyegresspeer.go b/pkg/client/applyconfiguration/apis/v1alpha1/adminnetworkpolicyegresspeer.go