fix: review comments

Author: vknabel

.github/workflows/docker.yaml

@@ -41,4 +41,4 @@ jobs:
       with:
         context: .
         push: true
-        tags: ${{ env.REGISTRY }}/metal-stack/capms-controller:${{ env.tag }}
+        tags: ${{ env.REGISTRY }}/metal-stack/cluster-api-metal-stack-controller:${{ env.tag }}

Makefile

@@ -1,5 +1,5 @@
 # Image URL to use all building/pushing image targets
-IMG_NAME ?= ghcr.io/metal-stack/capms-controller
+IMG_NAME ?= ghcr.io/metal-stack/cluster-api-metal-stack-controller
 IMG_TAG ?= latest
 IMG ?= ${IMG_NAME}:${IMG_TAG}
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
@@ -52,8 +52,8 @@ release-manifests: $(KUSTOMIZE) build-installer ## Builds the manifests to publi
 	$(KUSTOMIZE) build config/default > $(RELEASE_DIR)/infrastructure-components.yaml
 	sed -i 's!image: $(IMG_NAME):latest!image: $(IMG_NAME):$(IMG_TAG)!' $(RELEASE_DIR)/infrastructure-components.yaml
 	cp metadata.yaml $(RELEASE_DIR)/metadata.yaml
-	# cp examples/clusterctl-templates/clusterctl-cluster.yaml $(RELEASE_DIR)/cluster-template.yaml
-	# cp examples/clusterctl-templates/example_variables.rc $(RELEASE_DIR)/example_variables.rc
+	cp config/clusterctl-templates/cluster-template.yaml $(RELEASE_DIR)/cluster-template.yaml
+	cp config/clusterctl-templates/example_variables.rc $(RELEASE_DIR)/example_variables.rc
 
 ##@ Development
 

capi-lab/Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := up
 
 KUBECONFIG := $(shell pwd)/mini-lab/.kubeconfig
-IMG ?= ghcr.io/metal-stack/capms-controller:latest
+IMG ?= ghcr.io/metal-stack/cluster-api-metal-stack-controller:latest
 
 .PHONY: up
 up: bake deploy-capi

config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: ghcr.io/metal-stack/capms-controller
-  newTag: xxxxxxx
+  newName: ghcr.io/metal-stack/cluster-api-metal-stack-controller
+  newTag: latest

config/manager/manager.yaml

@@ -33,48 +33,48 @@ spec:
         seccompProfile:
           type: RuntimeDefault
       containers:
-        - env:
-            - name: METAL_API_URL
-              valueFrom:
-                secretKeyRef:
-                  name: controller-manager-config
-                  key: api-url
-            - name: METAL_API_HMAC
-              valueFrom:
-                secretKeyRef:
-                  name: controller-manager-config
-                  key: api-hmac
-          command:
-            - /manager
-          args:
-            - --leader-elect
-            - --health-probe-bind-address=:8081
-          image: controller:latest
-          imagePullPolicy: IfNotPresent
-          name: manager
-          securityContext:
-            allowPrivilegeEscalation: false
-            capabilities:
-              drop:
-                - "ALL"
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: 8081
-            initialDelaySeconds: 15
-            periodSeconds: 20
-          readinessProbe:
-            httpGet:
-              path: /readyz
-              port: 8081
-            initialDelaySeconds: 5
-            periodSeconds: 10
-          resources:
-            limits:
-              cpu: 500m
-              memory: 128Mi
-            requests:
-              cpu: 10m
-              memory: 64Mi
+      - env:
+          - name: METAL_API_URL
+            valueFrom:
+              secretKeyRef:
+                name: controller-manager-config
+                key: api-url
+          - name: METAL_API_HMAC
+            valueFrom:
+              secretKeyRef:
+                name: controller-manager-config
+                key: api-hmac
+        command:
+        - /manager
+        args:
+          - --leader-elect
+          - --health-probe-bind-address=:8081
+        image: controller:latest
+        imagePullPolicy: IfNotPresent
+        name: manager
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - "ALL"
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8081
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 8081
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        resources:
+          limits:
+            cpu: 500m
+            memory: 128Mi
+          requests:
+            cpu: 10m
+            memory: 64Mi
       serviceAccountName: controller-manager
       terminationGracePeriodSeconds: 10