Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable 'rancher-kubeconfigs' feature gate in charts #663

Merged
merged 2 commits into from
Aug 19, 2024
Merged

Disable 'rancher-kubeconfigs' feature gate in charts #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1257f4
Bump left out depenedencies to new versions
furkatgofurov7 Aug 15, 2024
702b49c
Disable 'rancher-kubeconfigs' feature gate by default in charts
furkatgofurov7 Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/rancher-turtles/questions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ questions:
show_subquestion_if: true
subquestions:
- variable: rancherTurtles.features.cluster-api-operator.kubectlImage
default: "registry.k8s.io/kubernetes/kubectl:v1.28.0"
default: "registry.k8s.io/kubernetes/kubectl:v1.30.0"
description: "Specify the image to use when cleaning up the Cluster API Operator manifests"
type: string
label: Cleanup Image
Expand All @@ -36,7 +36,7 @@ questions:
show_subquestion_if: true
subquestions:
- variable: rancherTurtles.features.rancher-webhook.kubectlImage
default: "registry.k8s.io/kubernetes/kubectl:v1.28.0"
default: "registry.k8s.io/kubernetes/kubectl:v1.30.0"
description: "Specify the image to use when cleaning up the webhooks"
type: string
label: Webhook Cleanup Image
Expand Down
6 changes: 3 additions & 3 deletions charts/rancher-turtles/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ rancherTurtles:
features:
cluster-api-operator:
cleanup: true
kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.28.0
kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.30.0
embedded-capi:
disabled: true
rancher-webhook:
cleanup: true
kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.28.0
kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.30.0
rancher-kubeconfigs:
label: true
Danil-Grigorev marked this conversation as resolved.
Show resolved Hide resolved
label: false
managementv3-cluster:
enabled: true
managementv3-cluster-migration:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ make test-e2e
This will consequently:
1. Build a docker image with the current repository code using `docker-build` Makefile target.
2. Generate a test release chart containing docker image tag built in the previous step
3. Install all prerequisite dependencies, like `helm`, `kubectl>=v1.27.0`, download `cluster-api-operator` helm release file from pre-specified URL.
3. Install all prerequisite dependencies, like `helm`, `kubectl>=v1.30.0`, download `cluster-api-operator` helm release file from pre-specified URL.
4. Create the test cluster, run the test suite, cleanup all test resourses.
5. Collect the [artifacts](#artifacts)

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/suites/update-labels/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ var _ = BeforeSuite(func() {
Tag: e2eConfig.GetVariable(e2e.TurtlesVersionVar),
WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
AdditionalValues: map[string]string{
"cluster-api-operator.cluster-api.version": "v1.6.0",
"rancherTurtles.features.rancher-kubeconfigs.label": "true", // force to be true even if the default in teh chart changes
"cluster-api-operator.cluster-api.version": "v1.7.3",
"rancherTurtles.features.rancher-kubeconfigs.label": "true", // force to be true even if the default in the chart changes
},
}

Expand Down