Merge pull request openstack-k8s-operators#1012 from dprince/drop_csv…

…_merger2

Drop csv merger and deduplicate RELATED_IMAGES...

.github/workflows/build-openstack-operator.yaml

@@ -17,7 +17,7 @@ jobs:
       operator_name: openstack
       go_version: 1.20.x
       operator_sdk_version: 1.31.0
-      bundle_dockerfile: ./custom-bundle.Dockerfile
+      bundle_dockerfile: ./bundle.Dockerfile
       catalog_extra_bundles_script: ./hack/pin-bundle-images.sh
     secrets:
       IMAGENAMESPACE: ${{ secrets.IMAGENAMESPACE }}

.prow_ci.env

@@ -1,3 +1,3 @@
 export USE_IMAGE_DIGESTS=true
-export BUNDLE_DOCKERFILE=custom-bundle.Dockerfile
+export BUNDLE_DOCKERFILE=bundle.Dockerfile
 export FAIL_FIPS_CHECK=true

Makefile

@@ -189,7 +189,6 @@ cover: test ## Run tests and display functional test coverage
 .PHONY: build
 build: generate fmt vet ## Build manager binary.
 	go build -o bin/manager main.go
-	go build -o bin/csv-merger cmd/csv-merger/csv-merger.go
 
 .PHONY: run
 run: export METRICS_PORT?=8080
@@ -330,7 +329,7 @@ endif
 endif
 
 .PHONY: bundle
-bundle: build manifests kustomize bundle-cache-extra-data operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
+bundle: build manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
@@ -339,7 +338,7 @@ bundle: build manifests kustomize bundle-cache-extra-data operator-sdk ## Genera
 
 .PHONY: bundle-build
 bundle-build: bundle ## Build the bundle image.
-	podman build -f custom-bundle.Dockerfile -t $(BUNDLE_IMG) .
+	podman build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
 .PHONY: bundle-push
 bundle-push: ## Push the bundle image.
@@ -469,10 +468,3 @@ run-with-webhook: manifests generate fmt vet ## Run a controller from your host.
 .PHONY: webhook-cleanup
 webhook-cleanup:
 	/bin/bash hack/clean_local_webhook.sh
-
-# refresh the bundle extra data based on go.mod entries
-# bundle extra data includes:
-#  - extracted ENV vars from all operators (required for webhooks)
-.PHONY: bundle-cache-extra-data
-bundle-cache-extra-data: build
-	bash hack/bundle-cache-data.sh

README.md

@@ -69,7 +69,7 @@ bundle.
 make dep-bundle-build-push
 ```
 
-3. Run bundle-build. This will execute podman to build the custom-bundle.Dockerfile.
+3. Run bundle-build. This will execute podman to build the bundle.Dockerfile.
 
 ```sh
 make bundle-build

apis/bases/client.openstack.org_openstackclients.yaml

@@ -12,6 +12,9 @@ spec:
     kind: OpenStackClient
     listKind: OpenStackClientList
     plural: openstackclients
+    shortNames:
+    - osclient
+    - osclients
     singular: openstackclient
   scope: Namespaced
   versions:

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -17530,6 +17530,8 @@ spec:
                     type: string
                   ceilometerNotificationImage:
                     type: string
+                  ceilometerProxyImage:
+                    type: string
                   ceilometerSgcoreImage:
                     type: string
                   cinderAPIImage:
@@ -17628,6 +17630,8 @@ spec:
                     type: string
                   octaviaAPIImage:
                     type: string
+                  octaviaApacheImage:
+                    type: string
                   octaviaHealthmanagerImage:
                     type: string
                   octaviaHousekeepingImage:

apis/bases/core.openstack.org_openstackversions.yaml

@@ -438,6 +438,8 @@ spec:
                     type: string
                   ceilometerNotificationImage:
                     type: string
+                  ceilometerProxyImage:
+                    type: string
                   ceilometerSgcoreImage:
                     type: string
                   cinderAPIImage:
@@ -536,6 +538,8 @@ spec:
                     type: string
                   octaviaAPIImage:
                     type: string
+                  octaviaApacheImage:
+                    type: string
                   octaviaHealthmanagerImage:
                     type: string
                   octaviaHousekeepingImage:

apis/client/v1beta1/openstackclient_types.go

@@ -72,6 +72,8 @@ type OpenStackClientStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+operator-sdk:csv:customresourcedefinitions:displayName="OpenStack Client"
+//+kubebuilder:resource:shortName=osclient;osclients
 //+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
 //+kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[0].message",description="Message"
 

apis/core/v1beta1/openstackversion_types.go

@@ -57,23 +57,26 @@ type ContainerDefaults struct {
 
 // ContainerImages - struct acts as the source of truth for container image URLs to be deployed
 type ContainerImages struct {
-	ContainerTemplate `json:",inline"`
+	ContainerTemplate    `json:",inline"`
+	OctaviaApacheImage   *string `json:"octaviaApacheImage,omitempty"`   // gets set to ApacheImage once applied
+	CeilometerProxyImage *string `json:"ceilometerProxyImage,omitempty"` // gets set to ApacheImage once applied
 	// CinderVolumeImages custom Cinder Volume images for each backend (default Cinder volume image is stored 'default' key)
 	// TODO: add validation to cinder-operator to prevent backend being named 'default'
 	CinderVolumeImages map[string]*string `json:"cinderVolumeImages,omitempty"`
 	// ManilaShareImages custom Manila Share images for each backend (default Manila share image is stored 'default' key)
-	// TODO: add validation to cinder-operator to prevent backend being named 'default'
+	// TODO: add validation to manila-operator to prevent backend being named 'default'
 	ManilaShareImages map[string]*string `json:"manilaShareImages,omitempty"`
 }
 
 // ContainerTemplate - struct that contains container image URLs for each service in OpenStackControlplane
 type ContainerTemplate struct {
-	AgentImage                    *string `json:"agentImage,omitempty"`
-	AnsibleeeImage                *string `json:"ansibleeeImage,omitempty"`
-	AodhAPIImage                  *string `json:"aodhAPIImage,omitempty"`
-	AodhEvaluatorImage            *string `json:"aodhEvaluatorImage,omitempty"`
-	AodhListenerImage             *string `json:"aodhListenerImage,omitempty"`
-	AodhNotifierImage             *string `json:"aodhNotifierImage,omitempty"`
+	AgentImage         *string `json:"agentImage,omitempty"`
+	AnsibleeeImage     *string `json:"ansibleeeImage,omitempty"`
+	AodhAPIImage       *string `json:"aodhAPIImage,omitempty"`
+	AodhEvaluatorImage *string `json:"aodhEvaluatorImage,omitempty"`
+	AodhListenerImage  *string `json:"aodhListenerImage,omitempty"`
+	AodhNotifierImage  *string `json:"aodhNotifierImage,omitempty"`
+	// this is shared by BaremetalOperator, OctaviaOperator, and TelemetryOperator
 	ApacheImage                   *string `json:"apacheImage,omitempty"`
 	BarbicanAPIImage              *string `json:"barbicanAPIImage,omitempty"`
 	BarbicanKeystoneListenerImage *string `json:"barbicanKeystoneListenerImage,omitempty"`