Skip to content

Commit 377ef6c

Browse files
Remove CAPI operator dependency and move FG to beta
Signed-off-by: Danil-Grigorev <[email protected]>
1 parent 1d11a6b commit 377ef6c

File tree

5 files changed

+3
-11
lines changed

5 files changed

+3
-11
lines changed

.github/workflows/test_chart.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ jobs:
5151
- name: Build docker image
5252
run: make docker-build
5353

54-
- name: Add CAPI operator chart repo
55-
run: helm repo add capi-operator https://kubernetes-sigs.github.io/cluster-api-operator
56-
5754
- name: Package operator chart
5855
run: make release-chart
5956

charts/rancher-turtles/Chart.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ keywords:
1111
- cluster-api
1212
- capi
1313
- provisioning
14-
dependencies:
15-
- name: cluster-api-operator
16-
version: v0.18.1
17-
repository: https://kubernetes-sigs.github.io/cluster-api-operator
18-
condition: cluster-api-operator.enabled
1914
annotations:
2015
catalog.cattle.io/certified: rancher
2116
catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension

charts/rancher-turtles/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ rancherTurtles:
2828
# embedded-operator: Embed operator controller loops.
2929
embedded-operator:
3030
# enabled: Turn on or off.
31-
enabled: false
31+
enabled: true
3232
# day2operations: Alpha feature.
3333
day2operations:
3434
# enabled: Turn on or off.

feature/feature.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ func init() {
4040
var defaultGates = map[featuregate.Feature]featuregate.FeatureSpec{
4141
AgentTLSMode: {Default: true, PreRelease: featuregate.Beta},
4242
UIPlugin: {Default: false, PreRelease: featuregate.Alpha},
43-
EmbeddedOperator: {Default: false, PreRelease: featuregate.Alpha},
43+
EmbeddedOperator: {Default: true, PreRelease: featuregate.Beta},
4444
}

scripts/turtles-dev.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ kind load docker-image $RANCHER_IMAGE --name $CLUSTER_NAME
4040
kubectl rollout status deployment coredns -n kube-system --timeout=90s
4141

4242
helm repo add rancher-latest https://releases.rancher.com/server-charts/latest --force-update
43-
helm repo add capi-operator https://kubernetes-sigs.github.io/cluster-api-operator --force-update
4443
helm repo add jetstack https://charts.jetstack.io --force-update
4544
helm repo add ngrok https://charts.ngrok.com --force-update
4645
helm repo update
@@ -95,6 +94,7 @@ install_local_rancher_turtles_chart() {
9594
-n rancher-turtles-system \
9695
--set cluster-api-operator.enabled=true \
9796
--set cluster-api-operator.cluster-api.enabled=false \
97+
--set rancherTurtles.features.embedded-operator.enabled=true \
9898
--set rancherTurtles.features.day2operations.enabled=true \
9999
--set rancherTurtles.features.day2operations.imageVersion=dev \
100100
--set rancherTurtles.features.day2operations.etcdBackupRestore.enabled=true \

0 commit comments

Comments
 (0)