Skip to content

Commit 0acdfe6

Browse files
paramiteparamite
committed
KSM
This patch add default image and TLS support for kube-state-metrics, a new component of Telemetry/Ceilometer resource. Related: OBSDA-574 Related: OSPRH-1052 Closes: OSPRH-11115
1 parent 851e9a2 commit 0acdfe6

12 files changed

+70
-0
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16864,6 +16864,8 @@ spec:
1686416864
type: string
1686516865
keystoneAPIImage:
1686616866
type: string
16867+
ksmImage:
16868+
type: string
1686716869
manilaAPIImage:
1686816870
type: string
1686916871
manilaSchedulerImage:

‎apis/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ spec:
146146
type: string
147147
keystoneAPIImage:
148148
type: string
149+
ksmImage:
150+
type: string
149151
manilaAPIImage:
150152
type: string
151153
manilaSchedulerImage:
@@ -353,6 +355,8 @@ spec:
353355
type: string
354356
keystoneAPIImage:
355357
type: string
358+
ksmImage:
359+
type: string
356360
manilaAPIImage:
357361
type: string
358362
manilaSchedulerImage:
@@ -531,6 +535,8 @@ spec:
531535
type: string
532536
keystoneAPIImage:
533537
type: string
538+
ksmImage:
539+
type: string
534540
manilaAPIImage:
535541
type: string
536542
manilaSchedulerImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ type ContainerTemplate struct {
126126
IronicPxeImage *string `json:"ironicPxeImage,omitempty"`
127127
IronicPythonAgentImage *string `json:"ironicPythonAgentImage,omitempty"`
128128
KeystoneAPIImage *string `json:"keystoneAPIImage,omitempty"`
129+
KsmImage *string `json:"ksmImage,omitempty"`
129130
ManilaAPIImage *string `json:"manilaAPIImage,omitempty"`
130131
ManilaSchedulerImage *string `json:"manilaSchedulerImage,omitempty"`
131132
MariadbImage *string `json:"mariadbImage,omitempty"`

‎apis/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bindata/crds/crds.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16961,6 +16961,8 @@ spec:
1696116961
type: string
1696216962
keystoneAPIImage:
1696316963
type: string
16964+
ksmImage:
16965+
type: string
1696416966
manilaAPIImage:
1696516967
type: string
1696616968
manilaSchedulerImage:
@@ -18524,6 +18526,8 @@ spec:
1852418526
type: string
1852518527
keystoneAPIImage:
1852618528
type: string
18529+
ksmImage:
18530+
type: string
1852718531
manilaAPIImage:
1852818532
type: string
1852918533
manilaSchedulerImage:
@@ -18731,6 +18735,8 @@ spec:
1873118735
type: string
1873218736
keystoneAPIImage:
1873318737
type: string
18738+
ksmImage:
18739+
type: string
1873418740
manilaAPIImage:
1873518741
type: string
1873618742
manilaSchedulerImage:
@@ -18909,6 +18915,8 @@ spec:
1890918915
type: string
1891018916
keystoneAPIImage:
1891118917
type: string
18918+
ksmImage:
18919+
type: string
1891218920
manilaAPIImage:
1891318921
type: string
1891418922
manilaSchedulerImage:

‎bindata/operator/operator.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ spec:
106106
value: quay.io/prometheus/mysqld-exporter:v0.16.0
107107
- name: RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT
108108
value: quay.io/openstack-k8s-operators/sg-core:v6.0.0
109+
- name: RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT
110+
value: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.10.0
109111
- name: RELATED_IMAGE_CINDER_API_IMAGE_URL_DEFAULT
110112
value: quay.io/podified-antelope-centos9/openstack-cinder-api:current-podified
111113
- name: RELATED_IMAGE_CINDER_BACKUP_IMAGE_URL_DEFAULT

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16864,6 +16864,8 @@ spec:
1686416864
type: string
1686516865
keystoneAPIImage:
1686616866
type: string
16867+
ksmImage:
16868+
type: string
1686716869
manilaAPIImage:
1686816870
type: string
1686916871
manilaSchedulerImage:

‎config/crd/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ spec:
146146
type: string
147147
keystoneAPIImage:
148148
type: string
149+
ksmImage:
150+
type: string
149151
manilaAPIImage:
150152
type: string
151153
manilaSchedulerImage:
@@ -353,6 +355,8 @@ spec:
353355
type: string
354356
keystoneAPIImage:
355357
type: string
358+
ksmImage:
359+
type: string
356360
manilaAPIImage:
357361
type: string
358362
manilaSchedulerImage:
@@ -531,6 +535,8 @@ spec:
531535
type: string
532536
keystoneAPIImage:
533537
type: string
538+
ksmImage:
539+
type: string
534540
manilaAPIImage:
535541
type: string
536542
manilaSchedulerImage:

‎config/default/manager_default_images.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ spec:
4343
value: quay.io/prometheus/mysqld-exporter:v0.16.0
4444
- name: RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT
4545
value: quay.io/openstack-k8s-operators/sg-core:v6.0.0
46+
- name: RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT
47+
value: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.10.0
4648
- name: RELATED_IMAGE_CINDER_API_IMAGE_URL_DEFAULT
4749
value: quay.io/podified-antelope-centos9/openstack-cinder-api:current-podified
4850
- name: RELATED_IMAGE_CINDER_BACKUP_IMAGE_URL_DEFAULT

‎hack/export_related_images.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT=quay.io/podified-
3535
export RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified
3636
export RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/sg-core:v6.0.0
3737
export RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/mysqld-exporter:v0.16.0
38+
export RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT=registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.10.0
3839
export RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-api:current-podified
3940
export RELATED_IMAGE_AODH_EVALUATOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-evaluator:current-podified
4041
export RELATED_IMAGE_AODH_NOTIFIER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-notifier:current-podified

0 commit comments

Comments
 (0)