Skip to content

Commit 5134812

Browse files
joshfrenchNareshKoduru
joshfrench
authored and
NareshKoduru
committed
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 <[email protected]> Collect additional logs with CAPD log collector Signed-off-by: Alexandr Demicev <[email protected]> :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] <[email protected]> :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] <[email protected]> 🌱 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 <[email protected]> * fix: test * fix: owner cluster handling Signed-off-by: sivchari <[email protected]> * remove duplicated error Signed-off-by: sivchari <[email protected]> * remove log variable Signed-off-by: sivchari <[email protected]> * fix error handling when the controller reads the cluster Signed-off-by: sivchari <[email protected]> * revert test modification Signed-off-by: sivchari <[email protected]> * delete log Signed-off-by: sivchari <[email protected]> * remove unnecessary deletion Signed-off-by: sivchari <[email protected]> * add detail of error Signed-off-by: sivchari <[email protected]> --------- Signed-off-by: sivchari <[email protected]> Add nilIsZero to all KSM metric configs where needed Signed-off-by: Tobias Giese <[email protected]> sorted labels and annotations in alphabatical order Signed-off-by: hackeramitkumar <[email protected]> 📖 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 <[email protected]> sorted labels and annotations in alphabatical order Signed-off-by: hackeramitkumar <[email protected]> 📖 Fix CAPZ redirection links in quick-start page Trigger Build 📖 Fix CAPZ redirection links in quick-start page
1 parent 057fdff commit 5134812

File tree

45 files changed

+350
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+350
-189
lines changed

‎.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fetch-depth: 0
2323
- name: Get changed files
2424
id: changed-files
25-
uses: tj-actions/changed-files@c65cd883420fd2eb864698a825fc4162dd94482c # tag=v44.5.7
25+
uses: tj-actions/changed-files@40853de9f8ce2d6cfdc73c1b96f14e22ba44aec4 # tag=v45.0.0
2626
- name: Get release version
2727
id: release-version
2828
run: |

‎api/v1beta1/condition_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ type Condition struct {
7474

7575
// The reason for the condition's last transition in CamelCase.
7676
// The specific API may choose whether or not this field is considered a guaranteed API.
77-
// This field may not be empty.
77+
// This field may be empty.
7878
// +optional
7979
Reason string `json:"reason,omitempty"`
8080

‎api/v1beta1/zz_generated.openapi.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ func (r *KubeadmConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
157157

158158
// Look up the owner of this kubeadm config if there is one
159159
configOwner, err := bsutil.GetTypedConfigOwner(ctx, r.Client, config)
160-
if apierrors.IsNotFound(err) {
161-
// Could not find the owner yet, this is not an error and will rereconcile when the owner gets set.
162-
return ctrl.Result{}, nil
163-
}
164160
if err != nil {
161+
if apierrors.IsNotFound(err) {
162+
// Could not find the owner yet, this is not an error and will rereconcile when the owner gets set.
163+
return ctrl.Result{}, nil
164+
}
165165
return ctrl.Result{}, errors.Wrapf(err, "failed to get owner")
166166
}
167167
if configOwner == nil {

‎cmd/clusterctl/client/config/cert_manager_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const (
2929
CertManagerConfigKey = "cert-manager"
3030

3131
// CertManagerDefaultVersion defines the default cert-manager version to be used by clusterctl.
32-
CertManagerDefaultVersion = "v1.15.2"
32+
CertManagerDefaultVersion = "v1.15.3"
3333

3434
// CertManagerDefaultURL defines the default cert-manager repository url to be used by clusterctl.
3535
// NOTE: At runtime CertManagerDefaultVersion may be replaced with the

‎config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/cluster.x-k8s.io_clusters.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/cluster.x-k8s.io_machinepools.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/cluster.x-k8s.io_machines.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/cluster.x-k8s.io_machinesets.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/ipam.cluster.x-k8s.io_ipaddressclaims.yaml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/metrics/crd-metrics-config.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ spec:
6464
- conditions
6565
valueFrom:
6666
- status
67+
nilIsZero: true
6768
type: StateSet
6869
- name: status_condition_last_transition_time
6970
help: The condition last transition time of a clusterclass.
@@ -79,6 +80,7 @@ spec:
7980
- conditions
8081
valueFrom:
8182
- lastTransitionTime
83+
nilIsZero: true
8284
type: Gauge
8385
- name: owner
8486
help: Owner references.
@@ -175,6 +177,7 @@ spec:
175177
path:
176178
- status
177179
- phase
180+
nilIsZero: true
178181
type: StateSet
179182
- name: created
180183
help: Unix creation timestamp.
@@ -212,6 +215,7 @@ spec:
212215
- conditions
213216
valueFrom:
214217
- status
218+
nilIsZero: true
215219
type: StateSet
216220
- name: status_condition_last_transition_time
217221
help: The condition last transition time of a cluster.
@@ -227,6 +231,7 @@ spec:
227231
- conditions
228232
valueFrom:
229233
- lastTransitionTime
234+
nilIsZero: true
230235
type: Gauge
231236
- groupVersionKind:
232237
group: controlplane.cluster.x-k8s.io
@@ -348,6 +353,7 @@ spec:
348353
- conditions
349354
valueFrom:
350355
- status
356+
nilIsZero: true
351357
type: StateSet
352358
- name: status_condition_last_transition_time
353359
help: The condition last transition time of a kubeadmcontrolplane.
@@ -363,6 +369,7 @@ spec:
363369
- conditions
364370
valueFrom:
365371
- lastTransitionTime
372+
nilIsZero: true
366373
type: Gauge
367374
- name: owner
368375
help: Owner references.
@@ -447,6 +454,7 @@ spec:
447454
- conditions
448455
valueFrom:
449456
- status
457+
nilIsZero: true
450458
type: StateSet
451459
- name: status_condition_last_transition_time
452460
help: The condition last transition time of a kubeadmconfig.
@@ -462,6 +470,7 @@ spec:
462470
- conditions
463471
valueFrom:
464472
- lastTransitionTime
473+
nilIsZero: true
465474
type: Gauge
466475
- name: owner
467476
help: Owner references.
@@ -609,6 +618,7 @@ spec:
609618
path:
610619
- status
611620
- phase
621+
nilIsZero: true
612622
type: StateSet
613623
- name: created
614624
help: Unix creation timestamp.
@@ -646,6 +656,7 @@ spec:
646656
- conditions
647657
valueFrom:
648658
- status
659+
nilIsZero: true
649660
type: StateSet
650661
- name: status_condition_last_transition_time
651662
help: The condition last transition time of a machine.
@@ -661,6 +672,7 @@ spec:
661672
- conditions
662673
valueFrom:
663674
- lastTransitionTime
675+
nilIsZero: true
664676
type: Gauge
665677
- name: owner
666678
help: Owner references.
@@ -868,6 +880,7 @@ spec:
868880
- conditions
869881
valueFrom:
870882
- status
883+
nilIsZero: true
871884
type: StateSet
872885
- name: status_condition_last_transition_time
873886
help: The condition last transition time of a machinedeployment.
@@ -883,6 +896,7 @@ spec:
883896
- conditions
884897
valueFrom:
885898
- lastTransitionTime
899+
nilIsZero: true
886900
type: Gauge
887901
- name: owner
888902
help: Owner references.
@@ -937,6 +951,7 @@ spec:
937951
path:
938952
- status
939953
- currentHealthy
954+
nilIsZero: true
940955
type: Gauge
941956
- name: status_expected_machines
942957
help: Total number of pods counted by this machinehealthcheck.
@@ -945,6 +960,7 @@ spec:
945960
path:
946961
- status
947962
- expectedMachines
963+
nilIsZero: true
948964
type: Gauge
949965
- name: status_remediations_allowed
950966
help: Number of machine remediations that are currently allowed.
@@ -953,6 +969,7 @@ spec:
953969
path:
954970
- status
955971
- remediationsAllowed
972+
nilIsZero: true
956973
type: Gauge
957974
- name: created
958975
help: Unix creation timestamp.
@@ -990,6 +1007,7 @@ spec:
9901007
- conditions
9911008
valueFrom:
9921009
- status
1010+
nilIsZero: true
9931011
type: StateSet
9941012
- name: status_condition_last_transition_time
9951013
help: The condition last transition time of a machinehealthcheck.
@@ -1005,6 +1023,7 @@ spec:
10051023
- conditions
10061024
valueFrom:
10071025
- lastTransitionTime
1026+
nilIsZero: true
10081027
type: Gauge
10091028
- name: owner
10101029
help: Owner references.
@@ -1104,6 +1123,7 @@ spec:
11041123
path:
11051124
- status
11061125
- fullyLabeledReplicas
1126+
nilIsZero: true
11071127
type: Gauge
11081128
- name: status_replicas_ready
11091129
help: The number of ready replicas per machineset.
@@ -1159,6 +1179,7 @@ spec:
11591179
- conditions
11601180
valueFrom:
11611181
- status
1182+
nilIsZero: true
11621183
type: StateSet
11631184
- name: status_condition_last_transition_time
11641185
help: The condition last transition time of a machineset.
@@ -1174,6 +1195,7 @@ spec:
11741195
- conditions
11751196
valueFrom:
11761197
- lastTransitionTime
1198+
nilIsZero: true
11771199
type: Gauge
11781200
- name: owner
11791201
help: Owner references.
@@ -1310,6 +1332,7 @@ spec:
13101332
path:
13111333
- status
13121334
- phase
1335+
nilIsZero: true
13131336
type: StateSet
13141337
- name: created
13151338
help: Unix creation timestamp.
@@ -1347,6 +1370,7 @@ spec:
13471370
- conditions
13481371
valueFrom:
13491372
- status
1373+
nilIsZero: true
13501374
type: StateSet
13511375
- name: status_condition_last_transition_time
13521376
help: The condition last transition time of a machinepool.
@@ -1362,6 +1386,7 @@ spec:
13621386
- conditions
13631387
valueFrom:
13641388
- lastTransitionTime
1389+
nilIsZero: true
13651390
type: Gauge
13661391
- name: owner
13671392
help: Owner references.

‎config/metrics/templates/cluster.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,5 @@
7676
path:
7777
- status
7878
- phase
79+
nilIsZero: true
7980
type: StateSet

‎config/metrics/templates/common_metrics.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
- conditions
3535
valueFrom:
3636
- status
37+
nilIsZero: true
3738
type: StateSet
3839
- name: status_condition_last_transition_time
3940
help: The condition last transition time of a ${RESOURCE}.
@@ -49,4 +50,5 @@
4950
- conditions
5051
valueFrom:
5152
- lastTransitionTime
53+
nilIsZero: true
5254
type: Gauge

‎config/metrics/templates/machine.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,5 @@
127127
path:
128128
- status
129129
- phase
130+
nilIsZero: true
130131
type: StateSet

0 commit comments

Comments
 (0)