Merge pull request #1510 from Danil-Grigorev/embed-capio

Add operator manifests to turtles API

Author: alexander-demicev

Makefile

@@ -235,8 +235,9 @@ manifests: generate
 
 .PHONY: generate-manifests-external
 generate-manifests-external: vendor controller-gen ## Generate ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) rbac:roleName=manager-role crd paths="./api/rancher/..." output:crd:artifacts:config=hack/crd/bases
-	$(CONTROLLER_GEN) rbac:roleName=manager-role crd paths="./vendor/sigs.k8s.io/cluster-api/..." output:crd:artifacts:config=hack/crd/bases
+	$(CONTROLLER_GEN) crd paths="./api/rancher/..." output:crd:artifacts:config=hack/crd/bases
+	$(CONTROLLER_GEN) crd paths="./vendor/sigs.k8s.io/cluster-api/..." output:crd:artifacts:config=hack/crd/bases
+	$(CONTROLLER_GEN) crd paths="./vendor/sigs.k8s.io/cluster-api-operator/..." output:crd:artifacts:config=./config/operator/bases
 	# Vendor is only required for pulling latest CRDs from the dependencies
 	$(MAKE) vendor-clean
 
@@ -555,8 +556,10 @@ 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 ./config/operatorchart > $(CHART_DIR)/templates/operator-crds.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 embedded-operator $(CHART_DIR)/templates/operator-crds.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)

charts/rancher-turtles/questions.yml

@@ -51,4 +51,9 @@ questions:
         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"
+        show_if: "rancherTurtles.features.day2operations.enabled"
+      - variable: rancherTurtles.features.embedded-operator.enabled
+        label: "Enable Turtles Embedded Operator"
+        description: "[ALPHA] Enable Turtles Embedded Operator functionality in Rancher Turtles."
+        type: boolean
+        group: "Embedded operator"

charts/rancher-turtles/templates/clusterctl-config.yaml

@@ -0,0 +1,7 @@
+{{- if index .Values "rancherTurtles" "features" "embedded-operator" "enabled" }}
+apiversion: v1
+kind: ConfigMap
+metadata:
+  name: clusterctl-config
+  namespace: '{{ .Values.rancherTurtles.namespace }}'
+{{- end}}

charts/rancher-turtles/templates/deployment.yaml

@@ -71,8 +71,20 @@ spec:
           requests:
             cpu: 10m
             memory: 128Mi
+        {{- if index .Values "rancherTurtles" "features" "embedded-operator" "enabled" }}
+        {{- with .Values.rancherTurtles.volumeMounts.manager }}
+        volumeMounts:
+        {{- toYaml . | nindent 12 }}
+        {{- end }}
+        {{- end }}
       serviceAccountName: rancher-turtles-manager
       terminationGracePeriodSeconds: 10
+      {{- if index .Values "rancherTurtles" "features" "embedded-operator" "enabled" }}
+      {{- with .Values.rancherTurtles.volumes }}
+      volumes:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master

charts/rancher-turtles/templates/operator-crds.yaml

@@ -128,6 +128,17 @@
                 }
               }
             },
+            "embedded-operator": {
+              "type": "object",
+              "description": "Enable embedded operator controller loops.",
+              "properties": {
+                "enabled": {
+                  "type": "boolean",
+                  "default": false,
+                  "description": "Turn on or off."
+                }
+              }
+            },
             "clusterclass-operations": {
               "type": "object",
               "description": "Alpha feature. Not ready for testing yet.",
@@ -155,6 +166,53 @@
               }
             }
           }
+        },
+        "volumes": {
+          "type": "array",
+          "description": "Volumes for controller pods.",
+          "items": {
+            "type": "object",
+            "required": [
+              "name",
+              "configMap"
+            ],
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "configMap": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "default": "clusterctl-config",
+                    "description": "ConfigMap for clusterctl."
+                  }
+                }
+              }
+            }
+          }
+        },
+        "volumeMounts": {
+          "type": "object",
+          "properties": {
+            "manager": {
+              "type": "array",
+              "description": "Mount volumes to pods.",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "mountPath": { "type": "string" },
+                  "name": { "type": "string" },
+                  "readOnly": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Mount as read-only."
+                  }
+                }
+              }
+            }
+          }
         }
       }
     },

charts/rancher-turtles/values.schema.json

@@ -25,6 +25,10 @@ rancherTurtles:
   kubectlImage: registry.k8s.io/kubernetes/kubectl:v1.30.0
   # features: Optional and experimental features.
   features:
+    # embedded-operator: Embed operator controller loops.
+    embedded-operator:
+      # enabled: Turn on or off.
+      enabled: false
     # day2operations: Alpha feature.
     day2operations:
       # enabled: Turn on or off.
@@ -53,6 +57,16 @@ rancherTurtles:
       imageVersion: v0.0.0
       # imagePullPolicy: Pull policy.
       imagePullPolicy: IfNotPresent
+  # volumes: Volumes for controller pods.
+  volumes:
+    - name: clusterctl-config
+      configMap:
+        name: clusterctl-config
+  # volumeMounts: Volume mounts for controller pods.
+  volumeMounts:
+    manager:
+      - mountPath: /config
+        name: clusterctl-config
 
 # cluster-api-operator: Manages Cluster API components.
 cluster-api-operator: