cluster.status.conditions.reason may indeed be empty

regenerate CRDs 🌱 test: improve autoscale tests for to/from zero and running autoscaler in bootstrap cluster (kubernetes-sigs#11082) * test: allow deploying autoscaler to management cluster * test: make machine pools optional in autoscaler test * test: implement optional scale from/to zero tests for autoscale * test: allow modification of apigroup for infrastructure * test: wait for rollouts to finish in autoscaler tests * test: drop cleaning up autoscaler for machine pools * review fix * add comment about AutoScaleFromZero * remove autoscale from zero test for unsupported MachinePools * review fixes update cert-manager to 1.15.3 Signed-off-by: Troy Connor <troy0820@users.noreply.github.com> Collect additional logs with CAPD log collector Signed-off-by: Alexandr Demicev <alexandr.demicev@suse.com> :seedling: Bump tj-actions/changed-files in the all-github-actions group Bumps the all-github-actions group with 1 update: [tj-actions/changed-files](https://github.com/tj-actions/changed-files). Updates `tj-actions/changed-files` from 44.5.7 to 45.0.0 - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](tj-actions/changed-files@c65cd88...40853de) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-github-actions ... Signed-off-by: dependabot[bot] <support@github.com> :seedling: Bump google.golang.org/api Bumps the all-go-mod-patch-and-minor group with 1 update in the /hack/tools directory: [google.golang.org/api](https://github.com/googleapis/google-api-go-client). Updates `google.golang.org/api` from 0.193.0 to 0.194.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](googleapis/google-api-go-client@v0.193.0...v0.194.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor ... Signed-off-by: dependabot[bot] <support@github.com> 🌱 Fix error handling when the resource is not found (kubernetes-sigs#10907) * fix: error handling when the resource is not found Signed-off-by: sivchari <shibuuuu5@gmail.com> * fix: test * fix: owner cluster handling Signed-off-by: sivchari <shibuuuu5@gmail.com> * remove duplicated error Signed-off-by: sivchari <shibuuuu5@gmail.com> * remove log variable Signed-off-by: sivchari <shibuuuu5@gmail.com> * fix error handling when the controller reads the cluster Signed-off-by: sivchari <shibuuuu5@gmail.com> * revert test modification Signed-off-by: sivchari <shibuuuu5@gmail.com> * delete log Signed-off-by: sivchari <shibuuuu5@gmail.com> * remove unnecessary deletion Signed-off-by: sivchari <shibuuuu5@gmail.com> * add detail of error Signed-off-by: sivchari <shibuuuu5@gmail.com> --------- Signed-off-by: sivchari <shibuuuu5@gmail.com> Add nilIsZero to all KSM metric configs where needed Signed-off-by: Tobias Giese <tgiese@nvidia.com> sorted labels and annotations in alphabatical order Signed-off-by: hackeramitkumar <amit9116260192@gmail.com> 📖 Fix CAPZ redirection links in quick-start page Trigger Build Trigger Build Add nilIsZero to all KSM metric configs where needed Signed-off-by: Tobias Giese <tgiese@nvidia.com> sorted labels and annotations in alphabatical order Signed-off-by: hackeramitkumar <amit9116260192@gmail.com> 📖 Fix CAPZ redirection links in quick-start page Trigger Build 📖 Fix CAPZ redirection links in quick-start page
NareshKoduru · Aug 29, 2024 · 5134812 · 5134812
1 parent 057fdff
commit 5134812
Show file tree

Hide file tree

Showing 45 changed files with 350 additions and 189 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@c65cd883420fd2eb864698a825fc4162dd94482c # tag=v44.5.7
+        uses: tj-actions/changed-files@40853de9f8ce2d6cfdc73c1b96f14e22ba44aec4 # tag=v45.0.0
       - name: Get release version
         id: release-version
         run: |

diff --git a/api/v1beta1/condition_types.go b/api/v1beta1/condition_types.go
@@ -74,7 +74,7 @@ type Condition struct {
 
 	// The reason for the condition's last transition in CamelCase.
 	// The specific API may choose whether or not this field is considered a guaranteed API.
-	// This field may not be empty.
+	// This field may be empty.
 	// +optional
 	Reason string `json:"reason,omitempty"`
 

diff --git a/api/v1beta1/zz_generated.openapi.go b/api/v1beta1/zz_generated.openapi.go
diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
diff --git a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go
@@ -157,11 +157,11 @@ func (r *KubeadmConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 	// Look up the owner of this kubeadm config if there is one
 	configOwner, err := bsutil.GetTypedConfigOwner(ctx, r.Client, config)
-	if apierrors.IsNotFound(err) {
-		// Could not find the owner yet, this is not an error and will rereconcile when the owner gets set.
-		return ctrl.Result{}, nil
-	}
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			// Could not find the owner yet, this is not an error and will rereconcile when the owner gets set.
+			return ctrl.Result{}, nil
+		}
 		return ctrl.Result{}, errors.Wrapf(err, "failed to get owner")
 	}
 	if configOwner == nil {

diff --git a/cmd/clusterctl/client/config/cert_manager_client.go b/cmd/clusterctl/client/config/cert_manager_client.go
@@ -29,7 +29,7 @@ const (
 	CertManagerConfigKey = "cert-manager"
 
 	// CertManagerDefaultVersion defines the default cert-manager version to be used by clusterctl.
-	CertManagerDefaultVersion = "v1.15.2"
+	CertManagerDefaultVersion = "v1.15.3"
 
 	// CertManagerDefaultURL defines the default cert-manager repository url to be used by clusterctl.
 	// NOTE: At runtime CertManagerDefaultVersion may be replaced with the

diff --git a/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml b/config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_clusters.yaml b/config/crd/bases/cluster.x-k8s.io_clusters.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml b/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml b/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_machinepools.yaml b/config/crd/bases/cluster.x-k8s.io_machinepools.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_machines.yaml b/config/crd/bases/cluster.x-k8s.io_machines.yaml
diff --git a/config/crd/bases/cluster.x-k8s.io_machinesets.yaml b/config/crd/bases/cluster.x-k8s.io_machinesets.yaml
diff --git a/config/crd/bases/ipam.cluster.x-k8s.io_ipaddressclaims.yaml b/config/crd/bases/ipam.cluster.x-k8s.io_ipaddressclaims.yaml
diff --git a/config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml b/config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml
diff --git a/config/metrics/crd-metrics-config.yaml b/config/metrics/crd-metrics-config.yaml
@@ -64,6 +64,7 @@ spec:
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a clusterclass.
@@ -79,6 +80,7 @@ spec:
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
     - name: owner
       help: Owner references.
@@ -175,6 +177,7 @@ spec:
           path:
           - status
           - phase
+          nilIsZero: true
         type: StateSet
     - name: created
       help: Unix creation timestamp.
@@ -212,6 +215,7 @@ spec:
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a cluster.
@@ -227,6 +231,7 @@ spec:
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
   - groupVersionKind:
       group: controlplane.cluster.x-k8s.io
@@ -348,6 +353,7 @@ spec:
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a kubeadmcontrolplane.
@@ -363,6 +369,7 @@ spec:
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
     - name: owner
       help: Owner references.
@@ -447,6 +454,7 @@ spec:
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a kubeadmconfig.
@@ -462,6 +470,7 @@ spec:
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
     - name: owner
       help: Owner references.
@@ -609,6 +618,7 @@ spec:
           path:
           - status
           - phase
+          nilIsZero: true
         type: StateSet
     - name: created
       help: Unix creation timestamp.
@@ -646,6 +656,7 @@ spec:
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a machine.
@@ -661,6 +672,7 @@ spec:
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
     - name: owner
       help: Owner references.
@@ -868,6 +880,7 @@ spec:
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a machinedeployment.
@@ -883,6 +896,7 @@ spec:
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
     - name: owner
       help: Owner references.
@@ -937,6 +951,7 @@ spec:
           path:
           - status
           - currentHealthy
+          nilIsZero: true
         type: Gauge
     - name: status_expected_machines
       help: Total number of pods counted by this machinehealthcheck.
@@ -945,6 +960,7 @@ spec:
           path:
           - status
           - expectedMachines
+          nilIsZero: true
         type: Gauge
     - name: status_remediations_allowed
       help: Number of machine remediations that are currently allowed.
@@ -953,6 +969,7 @@ spec:
           path:
           - status
           - remediationsAllowed
+          nilIsZero: true
         type: Gauge
     - name: created
       help: Unix creation timestamp.
@@ -990,6 +1007,7 @@ spec:
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a machinehealthcheck.
@@ -1005,6 +1023,7 @@ spec:
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
     - name: owner
       help: Owner references.
@@ -1104,6 +1123,7 @@ spec:
           path:
           - status
           - fullyLabeledReplicas
+          nilIsZero: true
         type: Gauge
     - name: status_replicas_ready
       help: The number of ready replicas per machineset.
@@ -1159,6 +1179,7 @@ spec:
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a machineset.
@@ -1174,6 +1195,7 @@ spec:
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
     - name: owner
       help: Owner references.
@@ -1310,6 +1332,7 @@ spec:
           path:
           - status
           - phase
+          nilIsZero: true
         type: StateSet
     - name: created
       help: Unix creation timestamp.
@@ -1347,6 +1370,7 @@ spec:
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a machinepool.
@@ -1362,6 +1386,7 @@ spec:
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
     - name: owner
       help: Owner references.

diff --git a/config/metrics/templates/cluster.yaml b/config/metrics/templates/cluster.yaml
@@ -76,4 +76,5 @@
           path:
           - status
           - phase
+          nilIsZero: true
         type: StateSet
diff --git a/config/metrics/templates/common_metrics.yaml b/config/metrics/templates/common_metrics.yaml
@@ -34,6 +34,7 @@
           - conditions
           valueFrom:
           - status
+          nilIsZero: true
         type: StateSet
     - name: status_condition_last_transition_time
       help: The condition last transition time of a ${RESOURCE}.
@@ -49,4 +50,5 @@
           - conditions
           valueFrom:
           - lastTransitionTime
+          nilIsZero: true
         type: Gauge
diff --git a/config/metrics/templates/machine.yaml b/config/metrics/templates/machine.yaml
@@ -127,4 +127,5 @@
           path:
           - status
           - phase
+          nilIsZero: true
         type: StateSet
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,4 +76,5 @@ @@
               path:
               - status
               - phase
+              nilIsZero: true
             type: StateSet