Adjust to use CloudKittyCore to avoid exposing images in the ControlPlane

Author: jlarriba

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -68,7 +68,6 @@ require (
 	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gophercloud/gophercloud v1.14.1 // indirect
-	github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -120,4 +119,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202507112000
 replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
 
 // Test CloudKitty
-replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28
+replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930092520-a449655a0baf

apis/go.mod

@@ -60,12 +60,10 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gophercloud/gophercloud v1.14.1 h1:DTCNaTVGl8/cFu58O1JwWgis9gtISAFONqpMKNg/Vpw=
 github.com/gophercloud/gophercloud v1.14.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
-github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba h1:P5Wgp2HfGfNPLCPpS+YqquKdrrl4tW0El7VX23D6vtg=
-github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba/go.mod h1:OBAgJh0mLYRvziBzBKr4/anrPHqGY9qEfuNXCpnUNi0=
 github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
 github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28 h1:9H+DxrR9/zzJtTZ9HeC7Ngxq83fLyZU6Z2sr4J5HOcI=
-github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28/go.mod h1:+SOqfHuYQlyFGykNxqMWZcFjdIB6+2+L3K7w+Uh+vCM=
+github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930092520-a449655a0baf h1:LZI2k8vV1oBFU3W5j3j+HNvOoBnieKD2tf+XKjjteVg=
+github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930092520-a449655a0baf/go.mod h1:v4Stbc6YFVR3r7ofSuErpTJ9Ki2Ka9Fs8S+dgiNqx60=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

apis/go.sum

@@ -54,7 +54,7 @@ metadata:
   name: openstack-operator-controller-manager
   namespace: '{{ .OperatorNamespace }}'
 spec:
-  replicas: {{ .OpenStackOperator.Deployment.Replicas }}
+  replicas: 1
   selector:
     matchLabels:
       openstack.org/operator-name: openstack
@@ -74,10 +74,7 @@ spec:
         command:
         - /manager
         env:
-{{- range .OpenStackOperator.Deployment.Manager.Env }}
-        - name: '{{ .Name }}'
-          value: '{{ .Value }}'
-{{- end }}
+        - envCustom: replace_me
         image: '{{ .OpenStackOperator.Deployment.Manager.Image }}'
         livenessProbe:
           httpGet:
@@ -98,11 +95,9 @@ spec:
           periodSeconds: 10
         resources:
           limits:
-            cpu: {{ .OpenStackOperator.Deployment.Manager.Resources.Limits.CPU }}
-            memory: {{ .OpenStackOperator.Deployment.Manager.Resources.Limits.Memory }}
+            customLimits: replace_me
           requests:
-            cpu: {{ .OpenStackOperator.Deployment.Manager.Resources.Requests.CPU }}
-            memory: {{ .OpenStackOperator.Deployment.Manager.Resources.Requests.Memory }}
+            customRequests: replace_me
         securityContext:
           allowPrivilegeEscalation: false
         volumeMounts:
@@ -114,7 +109,7 @@ spec:
         - --upstream=http://127.0.0.1:8080/
         - --logtostderr=true
         - --v=0
-        image: '{{ .OpenStackOperator.Deployment.KubeRbacProxy.Image }}'
+        image: kube-rbac-proxy:replace_me
         name: kube-rbac-proxy
         ports:
         - containerPort: 8443
@@ -129,22 +124,7 @@ spec:
             memory: 64Mi
         securityContext:
           allowPrivilegeEscalation: false
-      tolerations:
-{{- range .OpenStackOperator.Deployment.Tolerations }}
-      - key: "{{ .Key }}"
-{{- if .Operator }}
-        operator: "{{ .Operator }}"
-{{- end }}
-{{- if .Value }}
-        value: "{{ .Value }}"
-{{- end }}
-{{- if .Effect }}
-        effect: "{{ .Effect }}"
-{{- end }}
-{{- if .TolerationSeconds }}
-        tolerationSeconds: {{ .TolerationSeconds }}
-{{- end }}
-{{- end }}
+      customTolerations: replace_me
       securityContext:
         runAsNonRoot: true
       serviceAccountName: openstack-operator-controller-manager
@@ -459,4 +439,4 @@ webhooks:
     - UPDATE
     resources:
     - openstackdataplaneservices
-  sideEffects: None
+  sideEffects: None