Update CAPA release 2.10 (#365)

Signed-off-by: serngawy <[email protected]>

Author: serngawy

charts/cluster-api-provider-aws/crds/apiextensions.k8s.io_v1_customresourcedefinition_rosanetworks.infrastructure.cluster.x-k8s.io.yaml

@@ -49,19 +49,26 @@ spec:
             description: ROSANetworkSpec defines the desired state of ROSANetwork
             properties:
               availabilityZoneCount:
-                default: 1
                 description: |-
                   The number of availability zones to be used for creation of the network infrastructure.
                   You can specify anything between one and four, depending on the chosen AWS region.
+                  Either AvailabilityZoneCount OR AvailabilityZones must be set.
+                minimum: 1
                 type: integer
+                x-kubernetes-validations:
+                - message: availabilityZoneCount is immutable
+                  rule: self == oldSelf
               availabilityZones:
                 description: |-
                   The list of availability zones to be used for creation of the network infrastructure.
                   You can specify anything between one and four valid availability zones from a given region.
-                  Should you specify both the availabilityZoneCount and availabilityZones, the list of availability zones takes preference.
+                  Either AvailabilityZones OR AvailabilityZoneCount must be set.
                 items:
                   type: string
                 type: array
+                x-kubernetes-validations:
+                - message: availabilityZones is immutable
+                  rule: self == oldSelf
               cidrBlock:
                 description: CIDR block to be used for the VPC
                 format: cidr
@@ -90,10 +97,16 @@ spec:
                 description: The AWS region in which the components of ROSA network
                   infrastruture are to be crated
                 type: string
+                x-kubernetes-validations:
+                - message: region is immutable
+                  rule: self == oldSelf
               stackName:
                 description: The name of the cloudformation stack under which the
                   network infrastructure would be created
                 type: string
+                x-kubernetes-validations:
+                - message: stackName is immutable
+                  rule: self == oldSelf
               stackTags:
                 additionalProperties:
                   type: string

charts/cluster-api-provider-aws/templates/admissionregistration.k8s.io_v1_mutatingwebhookconfiguration_capa-mutating-webhook-configuration.yaml

@@ -226,6 +226,28 @@ webhooks:
     resources:
     - rosamachinepools
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: capa-webhook-service
+      namespace: capa-system
+      path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-rosanetwork
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: default.rosanetwork.infrastructure.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - infrastructure.cluster.x-k8s.io
+    apiVersions:
+    - v1beta2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - rosanetworks
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1

charts/cluster-api-provider-aws/templates/admissionregistration.k8s.io_v1_validatingwebhookconfiguration_capa-validating-webhook-configuration.yaml

@@ -249,6 +249,28 @@ webhooks:
     resources:
     - rosamachinepools
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: capa-webhook-service
+      namespace: capa-system
+      path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-rosanetwork
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validation.rosanetwork.infrastructure.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - infrastructure.cluster.x-k8s.io
+    apiVersions:
+    - v1beta2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - rosanetworks
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1

charts/cluster-api-provider-aws/templates/rbac.authorization.k8s.io_v1_clusterrole_capa-manager-role.yaml

@@ -215,6 +215,7 @@ rules:
   - infrastructure.cluster.x-k8s.io
   resources:
   - rosamachinepools/finalizers
+  - rosanetworks/finalizers
   - rosaroleconfigs/finalizers
   verbs:
   - update

src/cluster-api-provider-aws.yaml

@@ -9,7 +9,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -239,7 +239,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -587,7 +587,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -3972,7 +3972,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -7577,7 +7577,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -8894,7 +8894,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -10026,7 +10026,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -10193,7 +10193,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -10282,7 +10282,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -14711,7 +14711,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -17143,7 +17143,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -17751,7 +17751,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -19704,7 +19704,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -19751,19 +19751,26 @@ spec:
             description: ROSANetworkSpec defines the desired state of ROSANetwork
             properties:
               availabilityZoneCount:
-                default: 1
                 description: |-
                   The number of availability zones to be used for creation of the network infrastructure.
                   You can specify anything between one and four, depending on the chosen AWS region.
+                  Either AvailabilityZoneCount OR AvailabilityZones must be set.
+                minimum: 1
                 type: integer
+                x-kubernetes-validations:
+                - message: availabilityZoneCount is immutable
+                  rule: self == oldSelf
               availabilityZones:
                 description: |-
                   The list of availability zones to be used for creation of the network infrastructure.
                   You can specify anything between one and four valid availability zones from a given region.
-                  Should you specify both the availabilityZoneCount and availabilityZones, the list of availability zones takes preference.
+                  Either AvailabilityZones OR AvailabilityZoneCount must be set.
                 items:
                   type: string
                 type: array
+                x-kubernetes-validations:
+                - message: availabilityZones is immutable
+                  rule: self == oldSelf
               cidrBlock:
                 description: CIDR block to be used for the VPC
                 format: cidr
@@ -19792,10 +19799,16 @@ spec:
                 description: The AWS region in which the components of ROSA network
                   infrastruture are to be crated
                 type: string
+                x-kubernetes-validations:
+                - message: region is immutable
+                  rule: self == oldSelf
               stackName:
                 description: The name of the cloudformation stack under which the
                   network infrastructure would be created
                 type: string
+                x-kubernetes-validations:
+                - message: stackName is immutable
+                  rule: self == oldSelf
               stackTags:
                 additionalProperties:
                   type: string
@@ -19928,7 +19941,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
     controller-gen.kubebuilder.io/version: v0.17.3
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
@@ -20663,6 +20676,7 @@ rules:
   - infrastructure.cluster.x-k8s.io
   resources:
   - rosamachinepools/finalizers
+  - rosanetworks/finalizers
   - rosaroleconfigs/finalizers
   verbs:
   - update
@@ -20883,7 +20897,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
   name: capa-mutating-webhook-configuration
@@ -21107,6 +21121,28 @@ webhooks:
     resources:
     - rosamachinepools
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: capa-webhook-service
+      namespace: capa-system
+      path: /mutate-infrastructure-cluster-x-k8s-io-v1beta2-rosanetwork
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: default.rosanetwork.infrastructure.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - infrastructure.cluster.x-k8s.io
+    apiVersions:
+    - v1beta2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - rosanetworks
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1
@@ -21244,7 +21280,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capa-system/capa-serving-cert
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
   labels:
     cluster.x-k8s.io/provider: infrastructure-aws
   name: capa-validating-webhook-configuration
@@ -21491,6 +21527,28 @@ webhooks:
     resources:
     - rosamachinepools
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: capa-webhook-service
+      namespace: capa-system
+      path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-rosanetwork
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validation.rosanetwork.infrastructure.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - infrastructure.cluster.x-k8s.io
+    apiVersions:
+    - v1beta2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - rosanetworks
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1