Skip to content

Commit 4ba8301

Browse files
committed
[ci] Extend the kustomizations in logging to include autoscaling
The cifmw_edpm_prepare_kustomizations var defined in vars-autoscaling gets replaced by the one in logging. This means that autoscaling doesn't get enabled. This change moves the kustomzations into files that get applied during deployment. This is the same method that is used by the loggin dataplane configuration. * The logging and autoscaling kustomizations have been moved into the pre_deploy hooks, which copy the kustomizations to the appropriate file location. * The autoscaling kustomization is done in a newly-defined hook. * The dashboard dashboard enablement kustomization is separated out of the autoscaling
1 parent 1c10700 commit 4ba8301

File tree

4 files changed

+75
-46
lines changed

4 files changed

+75
-46
lines changed

ci/configure-autoscaling.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
- name: "Create the kustomization for deploying autoscaling"
3+
hosts: "{{ cifmw_target_hook_host | default('localhost') }}"
4+
gather_facts: false
5+
environment:
6+
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
7+
PATH: "{{ cifmw_path }}"
8+
tasks:
9+
- name: Copy controlplane kustomization
10+
ansible.builtin.copy:
11+
dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-kustomize-controlplane-autoscaling.yaml"
12+
content: |-
13+
apiVersion: kustomize.config.k8s.io/v1beta1
14+
kind: Kustomization
15+
namespace: openstack
16+
patches:
17+
- patch: |-
18+
apiVersion: core.openstack.org/v1beta1
19+
kind: OpenStackControlPlane
20+
metadata:
21+
name: unused
22+
spec:
23+
heat:
24+
enabled: true
25+
telemetry:
26+
enabled: true
27+
template:
28+
metricStorage:
29+
enabled: true
30+
monitoringStack:
31+
alertingEnabled: false
32+
autoscaling:
33+
enabled: true
34+
ceilometer:
35+
enabled: true
36+
mysqldExporterEnabled: true
37+
target:
38+
kind: OpenStackControlPlane
39+
- patch: |-
40+
apiVersion: core.openstack.org/v1beta1
41+
kind: OpenStackControlPlane
42+
metadata:
43+
name: unused
44+
spec:
45+
telemetry:
46+
template:
47+
metricStorage:
48+
dashboardsEnabled: true
49+
target:
50+
kind: OpenStackControlPlane

ci/deploy-logging-dependencies.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,25 @@
2525
- op: add
2626
path: /spec/services/-
2727
value: logging
28+
29+
- name: Copy controlplane kustomization
30+
ansible.builtin.copy:
31+
dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-kustomize-controlplane-logging.yaml"
32+
content: |-
33+
apiVersion: kustomize.config.k8s.io/v1beta1
34+
kind: Kustomization
35+
namespace: openstack
36+
patches:
37+
- patch: |-
38+
apiVersion: core.openstack.org/v1beta1
39+
kind: OpenStackControlPlane
40+
metadata:
41+
name: unused
42+
spec:
43+
telemetry:
44+
enabled: true
45+
template:
46+
logging:
47+
enabled: true
48+
target:
49+
kind: OpenStackControlPlane

ci/vars-autoscaling.yml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,6 @@ cifmw_openshift_obs_definition:
1515
source: redhat-operators
1616
sourceNamespace: openshift-marketplace
1717

18-
cifmw_edpm_prepare_kustomizations:
19-
- apiVersion: kustomize.config.k8s.io/v1beta1
20-
kind: Kustomization
21-
namespace: openstack
22-
patches:
23-
- patch: |-
24-
apiVersion: core.openstack.org/v1beta1
25-
kind: OpenStackControlPlane
26-
metadata:
27-
name: unused
28-
spec:
29-
heat:
30-
enabled: true
31-
telemetry:
32-
enabled: true
33-
template:
34-
metricStorage:
35-
enabled: true
36-
monitoringStack:
37-
alertingEnabled: false
38-
dashboardsEnabled: true
39-
autoscaling:
40-
enabled: true
41-
ceilometer:
42-
enabled: true
43-
mysqldExporterEnabled: true
44-
target:
45-
kind: OpenStackControlPlane
18+
pre_deploy_kustomize_autoscaling:
19+
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/configure-autoscaling.yml"
20+
type: playbook

ci/vars-logging.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,3 @@ cifmw_run_tests: false
33
pre_deploy_deploy_logging_dependencies:
44
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/deploy-logging-dependencies.yml"
55
type: playbook
6-
cifmw_edpm_prepare_kustomizations:
7-
- apiVersion: kustomize.config.k8s.io/v1beta1
8-
kind: Kustomization
9-
namespace: openstack
10-
patches:
11-
- patch: |-
12-
apiVersion: core.openstack.org/v1beta1
13-
kind: OpenStackControlPlane
14-
metadata:
15-
name: unused
16-
spec:
17-
telemetry:
18-
enabled: true
19-
template:
20-
logging:
21-
enabled: true
22-
target:
23-
kind: OpenStackControlPlane

0 commit comments

Comments
 (0)