Skip to content

Commit 5134812

Browse files
joshfrenchNareshKoduru
authored andcommitted
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)