Replace copy with template

Author: elfiesmelfie

ci/configure-cloudkitty.yml

@@ -62,41 +62,21 @@
             target:
               kind: OpenStackControlPlane
 
-      # This probably won't actually work, since there's no telemetry object yet at this point.
-      # The kustomization needs to be done post_deploy
-      #    - name: Copy telemetry kustomization
-      #      ansible.builtin.copy:
-      #        dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-kustomize-telemetry-cloudkitty.yaml"
-      #        content: |-
-      #          apiVersion: kustomize.config.k8s.io/v1beta1
-      #          kind: Kustomization
-      #          namespace: openstack
-      #          patches:
-      #          - patch: |-
-      #              apiVersion: core.openstack.org/v1beta1
-      #              kind: Telemetry
-      #              metadata:
-      #                name: telemetry-ck
-      #              spec:
-      #                cloudkitty:
-      #                  enabled: true
-      #                  secret: osp-secret
-      #                  passwordSelector:
-      #                    aodhService: AodhPassword
-      #                    ceilometerService: CeilometerPassword
-      #                    cloudKittyService: CloudKittyPassword
-      #                  # WORKAROUND
-      #                  # Need to set the images, since the defaulting is not working at the moment.
-      #                  # The container image is not being set, so the dbsync is failing.
-      #                  # The defaulting will not be done in the webhook until CK is added to the openstack-operator.
-      #                  # If I change the name of the CK, I can just configure using the CK CRD.
-      #                  # If I don't change the name, and disable it in telemetry, then the telemetry-operator will delete the telemetry telemetry.
-      #                  cloudKittyAPI:
-      #                    # containerImage: "{{ cloudkitty_api_image }}"
-      #                    containerImage: "quay.io/efoley/cloudkitty-api@sha256:baf3f44225be4ac55eef6e45ab4095a8284fc186da5916408dbf95767a1eb5e9"
-      #                  cloudKittyProc:
-      #                    # containerImage: "{{ cloudkitty_proc_image }}"
-      #                    containerImage: "quay.io/efoley/cloudkitty-processor@sha256:4ddd2f824b17c0c2fb39363369a16af49cb2d95c07916f52e2c509ceca677de9"
-      #            target:
-      #              kind: Telemetry
-      #
+    - name: Make sure logs directory exists
+      ansible.builtin.file:
+        path: "{{ logs_dir }}"
+        state: directory
+        recurse: true
+
+    - name: Create the CloudKitty kustomization from a template
+      ansible.builtin.template:
+        src: "kustomize-controlplane-cloudkitty.yaml.j2"
+        # dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-kustomize-controlplane-cloudkitty.yaml"
+        dest: "{{ logs_dir }}/90-kustomize-controlplane-cloudkitty.yaml"
+
+    - name: Compare the templated and copied files
+      ansible.builtin.command:
+        cmd: |
+         diff -s {{ logs_dir }}/90-kustomize-controlplane-cloudkitty.yaml  {{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-kustomize-controlplane-cloudkitty.yaml
+      register: output
+    - debug: var=output.stdout

ci/kustomize-controlplane-cloudkitty.yaml.j2

@@ -0,0 +1,34 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: openstack
+patches:
+- patch: |-
+    apiVersion: core.openstack.org/v1beta1
+    kind: OpenStackControlPlane
+    metadata:
+      name: unused
+    spec:
+      # Set overall storage class so we don't need to increase the
+      # number of PVCs that install_yamls creates
+      # this is only applicable to crc-based jobs, it is not in
+      # openshift by default, but is included in the crc distribution
+      storageClass: crc-csi-hostpath-provisioner
+      telemetry:
+        # this is needed so the secrets are created for dataplane deployment
+        enabled: true
+        template:
+          cloudkitty:
+            enabled: true
+            cloudKittyAPI:
+              containerImage: {{ telemetry_registry }}/openstack-cloudkitty-api:{{ telemetry_tag }}
+            cloudKittyProc:
+              containerImage: {{ telemetry_registry }}/openstack-cloudkitty-processor:{{ telemetry_tag }}
+            s3StorageConfig:
+              secret:
+                type: "s3"
+                name: "cloudkitty-loki-s3"
+          metricStorage:
+            enabled: true
+  target:
+    kind: OpenStackControlPlane