Merge pull request #534 from dprince/ksmImage_optional

openshift-merge-bot[bot] · web-flow · commit ef2b09e849a4 · 2024-11-19T19:54:39.000Z
Make ksmImage optional
diff --git a/api/bases/telemetry.openstack.org_autoscalings.yaml b/api/bases/telemetry.openstack.org_autoscalings.yaml
@@ -363,7 +363,6 @@ spec:
                 - databaseInstance
                 - evaluatorImage
                 - listenerImage
-                - memcachedInstance
                 - notifierImage
                 - secret
                 type: object
diff --git a/api/bases/telemetry.openstack.org_ceilometers.yaml b/api/bases/telemetry.openstack.org_ceilometers.yaml
@@ -206,7 +206,6 @@ spec:
             - centralImage
             - computeImage
             - ipmiImage
-            - ksmImage
             - notificationImage
             - proxyImage
             - secret
diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
@@ -376,7 +376,6 @@ spec:
                     - databaseInstance
                     - evaluatorImage
                     - listenerImage
-                    - memcachedInstance
                     - notifierImage
                     - secret
                     type: object
@@ -528,7 +527,6 @@ spec:
                 - centralImage
                 - computeImage
                 - ipmiImage
-                - ksmImage
                 - notificationImage
                 - proxyImage
                 - secret
diff --git a/api/v1beta1/autoscaling_types.go b/api/v1beta1/autoscaling_types.go
@@ -119,7 +119,7 @@ type AodhCore struct {
 	PreserveJobs bool `json:"preserveJobs"`
 
 	// Memcached instance name.
-	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=memcached
 	MemcachedInstance string `json:"memcachedInstance"`
 
diff --git a/api/v1beta1/ceilometer_types.go b/api/v1beta1/ceilometer_types.go
@@ -64,7 +64,7 @@ type CeilometerSpec struct {
 	// +kubebuilder:validation:Required
 	ProxyImage string `json:"proxyImage"`
 
-	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Optional
 	KSMImage string `json:"ksmImage"`
 }
 
diff --git a/config/crd/bases/telemetry.openstack.org_autoscalings.yaml b/config/crd/bases/telemetry.openstack.org_autoscalings.yaml
@@ -363,7 +363,6 @@ spec:
                 - databaseInstance
                 - evaluatorImage
                 - listenerImage
-                - memcachedInstance
                 - notifierImage
                 - secret
                 type: object
diff --git a/config/crd/bases/telemetry.openstack.org_ceilometers.yaml b/config/crd/bases/telemetry.openstack.org_ceilometers.yaml
@@ -206,7 +206,6 @@ spec:
             - centralImage
             - computeImage
             - ipmiImage
-            - ksmImage
             - notificationImage
             - proxyImage
             - secret
diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml
@@ -376,7 +376,6 @@ spec:
                     - databaseInstance
                     - evaluatorImage
                     - listenerImage
-                    - memcachedInstance
                     - notifierImage
                     - secret
                     type: object
@@ -528,7 +527,6 @@ spec:
                 - centralImage
                 - computeImage
                 - ipmiImage
-                - ksmImage
                 - notificationImage
                 - proxyImage
                 - secret

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ type CeilometerSpec struct {`
`64`	`64`	`// +kubebuilder:validation:Required`
`65`	`65`	ProxyImage string `json:"proxyImage"`
`66`	`66`
`67`		`- // +kubebuilder:validation:Required`
	`67`	`+ // +kubebuilder:validation:Optional`
`68`	`68`	KSMImage string `json:"ksmImage"`
`69`	`69`	`}`
`70`	`70`