feat: Alow user to enable/disable day 2 operations from Rancher UI

rancher · Feb 7, 2025 · adfd268 · adfd268
1 parent b8394d1
commit adfd268
Show file tree

Hide file tree

Showing 14 changed files with 361 additions and 105 deletions.
diff --git a/Makefile b/Makefile
@@ -556,19 +556,19 @@ release: clean-release $(RELEASE_DIR)  ## Builds and push container images using
 .PHONY: build-chart
 build-chart: $(HELM) $(KUSTOMIZE) $(RELEASE_DIR) $(CHART_RELEASE_DIR) $(CHART_PACKAGE_DIR) ## Builds the chart to publish with a release
 	$(KUSTOMIZE) build ./config/chart > $(CHART_DIR)/templates/rancher-turtles-components.yaml
-	$(KUSTOMIZE) build ./exp/day2/config/default > $(CHART_DIR)/templates/rancher-turtles-exp-day2-components.yaml
+	$(KUSTOMIZE) build ./exp/day2/config/chart > $(CHART_DIR)/templates/rancher-turtles-exp-day2-components.yaml
 	$(KUSTOMIZE) build ./exp/clusterclass/config/default > $(CHART_DIR)/templates/rancher-turtles-exp-clusterclass-components.yaml
-	./scripts/process-manifests.sh day2-operations $(CHART_DIR)/templates/rancher-turtles-exp-day2-components.yaml
+	./scripts/process-manifests.sh day2operations $(CHART_DIR)/templates/rancher-turtles-exp-day2-components.yaml
 	./scripts/process-manifests.sh clusterclass-operations $(CHART_DIR)/templates/rancher-turtles-exp-clusterclass-components.yaml
 	cp -rf $(CHART_DIR)/* $(CHART_RELEASE_DIR)
 
 	sed -i'' -e 's@image: .*@image: '"$(CONTROLLER_IMG)"'@' $(CHART_RELEASE_DIR)/values.yaml
 	sed -i'' -e 's@imageVersion: .*@imageVersion: '"$(RELEASE_TAG)"'@' $(CHART_RELEASE_DIR)/values.yaml
 	sed -i'' -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' $(CHART_RELEASE_DIR)/values.yaml
 
-	sed -i'' -e '/day2-operations:/,/image:/ s@image: .*@image: '"$(CONTROLLER_IMG)"'@' $(CHART_RELEASE_DIR)/values.yaml
-	sed -i'' -e '/day2-operations:/,/imageVersion:/ s@imageVersion: .*@imageVersion: '"$(RELEASE_TAG)"'@' $(CHART_RELEASE_DIR)/values.yaml
-	sed -i'' -e '/day2-operations:/,/imagePullPolicy:/ s@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' $(CHART_RELEASE_DIR)/values.yaml
+	sed -i'' -e '/day2operations:/,/image:/ s@image: .*@image: '"$(CONTROLLER_IMG)"'@' $(CHART_RELEASE_DIR)/values.yaml
+	sed -i'' -e '/day2operations:/,/imageVersion:/ s@imageVersion: .*@imageVersion: '"$(RELEASE_TAG)"'@' $(CHART_RELEASE_DIR)/values.yaml
+	sed -i'' -e '/day2operations:/,/imagePullPolicy:/ s@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' $(CHART_RELEASE_DIR)/values.yaml
 
 	sed -i'' -e '/clusterclass:/,/image:/ s@image: .*@image: '"$(CONTROLLER_IMG)"'@' $(CHART_RELEASE_DIR)/values.yaml
 	sed -i'' -e '/clusterclass:/,/imageVersion:/ s@imageVersion: .*@imageVersion: '"$(RELEASE_TAG)"'@' $(CHART_RELEASE_DIR)/values.yaml

diff --git a/charts/rancher-turtles/questions.yml b/charts/rancher-turtles/questions.yml
@@ -11,11 +11,11 @@ questions:
       - variable: cluster-api-operator.cert-manager.enabled
         default: false
         type: boolean
-        description: "Flag to enable or disable installation of cert-manager. If set to false then you will need to install cert-manager manually"
+        description: "Flag to enable or disable installation of cert-manager. If set to false then you will need to install cert-manager manually."
         label: "Enable Cert Manager"
       - variable: rancherTurtles.cluster-api-operator.cleanup
         default: true
-        description: "Specify that the CAPI Operator post-delete cleanup job will be performed"
+        description: "Specify that the CAPI Operator post-delete cleanup job will be performed."
         type: boolean
         label: Cleanup CAPI Operator installation
         group: "CAPI Operator cleanup settings"
@@ -26,19 +26,30 @@ questions:
         type: boolean
       - variable: rancherTurtles.features.addon-provider-fleet.enabled
         default: true
-        description: "[BETA] Enable Fleet Addon Provider functionality in Rancher Turtles"
+        description: "[BETA] Enable Fleet Addon Provider functionality in Rancher Turtles."
         type: boolean
         label: Seamless integration with Fleet and CAPI
         group: "Rancher Turtles Features Settings"
       - variable: rancherTurtles.features.agent-tls-mode.enabled
         default: false
-        description: "[ALPHA] If enabled Turtles will use the agent-tls-mode setting to determine CA cert trust mode for importing clusters"
+        description: "[ALPHA] If enabled Turtles will use the agent-tls-mode setting to determine CA cert trust mode for importing clusters."
         type: boolean
         label: Enable Agent TLS Mode
         group: "Rancher Turtles Features Settings"
       - variable: rancherTurtles.kubectlImage
         default: "registry.k8s.io/kubernetes/kubectl:v1.30.0"
-        description: "Specify the image to use when running kubectl in jobs"
+        description: "Specify the image to use when running kubectl in jobs."
         type: string
         label: Kubectl Image
         group: "Rancher Turtles Features Settings"
+      - variable: rancherTurtles.features.day2operations.enabled
+        label: "Enable Day 2 Operations functionality in Rancher Turtles"
+        description: "Use this setting to configure Day 2 Operations functionality in Rancher Turtles, such as enabling ETCD Backup and Restore."
+        type: boolean
+        group: "Rancher Turtles Features Settings"
+      - variable: rancherTurtles.features.day2operations.etcdBackupRestore.enabled
+        label: "Enable ETCD Backup and Restore"
+        description: "[ALPHA] Enable ETCD Backup and Restore functionality in Rancher Turtles."
+        type: boolean
+        group: "ETCD Backup and Restore Settings"
+        show_if: "rancherTurtles.features.day2operations.enabled"
diff --git a/charts/rancher-turtles/templates/rancher-turtles-exp-day2-components.yaml b/charts/rancher-turtles/templates/rancher-turtles-exp-day2-components.yaml
@@ -1,4 +1,4 @@
-{{- if index .Values "rancherTurtles" "features" "day2-operations" "enabled" }}
+{{- if index .Values "rancherTurtles" "features" "day2operations" "enabled" }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -563,93 +563,6 @@ spec:
   selector:
     turtles-capi.cattle.io: day2-operations
 ---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    control-plane: controller-manager
-    turtles-capi.cattle.io: day2-operations
-  name: rancher-turtles-day2-operations-controller-manager
-  namespace: {{ index .Values "rancherTurtles" "namespace" }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      control-plane: controller-manager
-      turtles-capi.cattle.io: day2-operations
-  template:
-    metadata:
-      annotations:
-        kubectl.kubernetes.io/default-container: manager
-      labels:
-        control-plane: controller-manager
-        turtles-capi.cattle.io: day2-operations
-    spec:
-      containers:
-      - args:
-        - --leader-elect
-        command:
-        - ./turtles-day2-operations
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: POD_UID
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.uid
-        {{- $imageVersion := index .Values "rancherTurtles" "features" "day2-operations" "imageVersion" -}}
-        {{- if contains "sha256:" $imageVersion }}
-        image: {{ index .Values "rancherTurtles" "features" "day2-operations" "image" }}@{{ index .Values "rancherTurtles" "features" "day2-operations" "imageVersion" }}
-        {{- else }}
-        image: {{ index .Values "rancherTurtles" "features" "day2-operations" "image" }}:{{ index .Values "rancherTurtles" "features" "day2-operations" "imageVersion" }}
-        {{- end }}
-        imagePullPolicy: '{{ index .Values "rancherTurtles" "features" "day2-operations" "imagePullPolicy" }}'
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 9440
-          initialDelaySeconds: 15
-          periodSeconds: 20
-        name: manager
-        ports:
-        - containerPort: 9443
-          name: webhook-server
-          protocol: TCP
-        readinessProbe:
-          httpGet:
-            path: /readyz
-            port: 9440
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        resources:
-          limits:
-            cpu: 500m
-            memory: 128Mi
-          requests:
-            cpu: 10m
-            memory: 64Mi
-        volumeMounts:
-        - mountPath: /tmp/k8s-webhook-server/serving-certs
-          name: cert
-          readOnly: true
-      serviceAccountName: rancher-turtles-day2-operations-manager
-      terminationGracePeriodSeconds: 10
-      tolerations:
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/control-plane
-      volumes:
-      - name: cert
-        secret:
-          secretName: rancher-turtles-day2-operations-webhook-service-cert
----
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:

diff --git a/charts/rancher-turtles/templates/rancher-turtles-exp-day2-deployment.yaml b/charts/rancher-turtles/templates/rancher-turtles-exp-day2-deployment.yaml
@@ -0,0 +1,86 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    control-plane: controller-manager
+    turtles-capi.cattle.io: day2-operations
+  name: rancher-turtles-day2-operations-controller-manager
+  namespace: '{{ .Values.rancherTurtles.namespace }}'
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      control-plane: controller-manager
+      turtles-capi.cattle.io: day2-operations
+  template:
+    metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: manager
+      labels:
+        control-plane: controller-manager
+        turtles-capi.cattle.io: day2-operations
+    spec:
+      containers:
+      - args:
+        - --leader-elect
+        - --feature-gates=etcd-backup-restore={{ .Values.rancherTurtles.features.day2operations.etcdBackupRestore.enabled }}
+        command:
+        - ./turtles-day2-operations
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_UID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.uid
+        {{- if (contains "sha256:" .Values.rancherTurtles.features.day2operations.imageVersion) }}
+        image: '{{ .Values.rancherTurtles.features.day2operations.image }}@{{ .Values.rancherTurtles.features.day2operations.imageVersion }}'
+        {{- else }}
+        image: '{{ .Values.rancherTurtles.features.day2operations.image }}:{{ .Values.rancherTurtles.features.day2operations.imageVersion }}'
+        {{- end }}
+        imagePullPolicy: '{{ .Values.rancherTurtles.features.day2operations.imagePullPolicy }}'
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 9440
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        name: manager
+        ports:
+        - containerPort: 9443
+          name: webhook-server
+          protocol: TCP
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 9440
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        resources:
+          limits:
+            cpu: 500m
+            memory: 128Mi
+          requests:
+            cpu: 10m
+            memory: 64Mi
+        volumeMounts:
+        - mountPath: /tmp/k8s-webhook-server/serving-certs
+          name: cert
+          readOnly: true
+      serviceAccountName: rancher-turtles-day2-operations-manager
+      terminationGracePeriodSeconds: 10
+      tolerations:
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/control-plane
+      volumes:
+      - name: cert
+        secret:
+          secretName: rancher-turtles-day2-operations-webhook-service-cert
diff --git a/charts/rancher-turtles/values.yaml b/charts/rancher-turtles/values.yaml
@@ -8,11 +8,13 @@ rancherTurtles:
   rancherInstalled: true
   kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.30.0
   features:
-    day2-operations:
+    day2operations:
       enabled: false
       image: controller
       imageVersion: v0.0.0
       imagePullPolicy: IfNotPresent
+      etcdBackupRestore:
+        enabled: false
     # beta feature, see documentation for more information on feature stages
     addon-provider-fleet:
       enabled: true