Merge pull request #698 from elfiesmelfie/ci/combine-autoscaling-logging

[ci] Extend the kustomizations in logging to include autoscaling

Author: openshift-merge-bot[bot]

ci/configure-autoscaling.yml

@@ -0,0 +1,50 @@
+---
+- name: "Create the kustomization for deploying autoscaling"
+  hosts: "{{ cifmw_target_hook_host | default('localhost')  }}"
+  gather_facts: false
+  environment:
+    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+    PATH: "{{ cifmw_path }}"
+  tasks:
+    - name: Copy controlplane kustomization
+      ansible.builtin.copy:
+        dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-kustomize-controlplane-autoscaling.yaml"
+        content: |-
+          apiVersion: kustomize.config.k8s.io/v1beta1
+          kind: Kustomization
+          namespace: openstack
+          patches:
+          - patch: |-
+              apiVersion: core.openstack.org/v1beta1
+              kind: OpenStackControlPlane
+              metadata:
+                name: unused
+              spec:
+                heat:
+                  enabled: true
+                telemetry:
+                  enabled: true
+                  template:
+                    metricStorage:
+                      enabled: true
+                      monitoringStack:
+                        alertingEnabled: false
+                    autoscaling:
+                      enabled: true
+                    ceilometer:
+                      enabled: true
+                      mysqldExporterEnabled: true
+            target:
+              kind: OpenStackControlPlane
+          - patch: |-
+              apiVersion: core.openstack.org/v1beta1
+              kind: OpenStackControlPlane
+              metadata:
+                name: unused
+              spec:
+                telemetry:
+                  template:
+                    metricStorage:
+                      dashboardsEnabled: true
+            target:
+              kind: OpenStackControlPlane

ci/deploy-logging-dependencies.yml

@@ -25,3 +25,25 @@
               - op: add
                 path: /spec/services/-
                 value: logging
+
+    - name: Copy controlplane kustomization
+      ansible.builtin.copy:
+        dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-kustomize-controlplane-logging.yaml"
+        content: |-
+          apiVersion: kustomize.config.k8s.io/v1beta1
+          kind: Kustomization
+          namespace: openstack
+          patches:
+          - patch: |-
+              apiVersion: core.openstack.org/v1beta1
+              kind: OpenStackControlPlane
+              metadata:
+                name: unused
+              spec:
+                telemetry:
+                  enabled: true
+                  template:
+                    logging:
+                      enabled: true
+            target:
+              kind: OpenStackControlPlane

ci/vars-autoscaling.yml

@@ -15,31 +15,6 @@ cifmw_openshift_obs_definition:
     source: redhat-operators
     sourceNamespace: openshift-marketplace
 
-cifmw_edpm_prepare_kustomizations:
-  - apiVersion: kustomize.config.k8s.io/v1beta1
-    kind: Kustomization
-    namespace: openstack
-    patches:
-    - patch: |-
-        apiVersion: core.openstack.org/v1beta1
-        kind: OpenStackControlPlane
-        metadata:
-          name: unused
-        spec:
-          heat:
-            enabled: true
-          telemetry:
-            enabled: true
-            template:
-              metricStorage:
-                enabled: true
-                monitoringStack:
-                  alertingEnabled: false
-                dashboardsEnabled: true
-              autoscaling:
-                enabled: true
-              ceilometer:
-                enabled: true
-                mysqldExporterEnabled: true
-      target:
-        kind: OpenStackControlPlane
+pre_deploy_kustomize_autoscaling:
+  source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/configure-autoscaling.yml"
+  type: playbook

ci/vars-logging.yml

@@ -3,21 +3,3 @@ cifmw_run_tests: false
 pre_deploy_deploy_logging_dependencies:
   source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/deploy-logging-dependencies.yml"
   type: playbook
-cifmw_edpm_prepare_kustomizations:
-  - apiVersion: kustomize.config.k8s.io/v1beta1
-    kind: Kustomization
-    namespace: openstack
-    patches:
-    - patch: |-
-        apiVersion: core.openstack.org/v1beta1
-        kind: OpenStackControlPlane
-        metadata:
-          name: unused
-        spec:
-          telemetry:
-            enabled: true
-            template:
-              logging:
-                enabled: true
-      target:
-        kind: OpenStackControlPlane