Webhook for default images

Makefile

@@ -449,6 +449,9 @@ SKIP_CERT ?=false
 .PHONY: run-with-webhook
 run-with-webhook: export METRICS_PORT?=33080
 run-with-webhook: export HEALTH_PORT?=33081
+run-with-webhook: export WATCHER_API_IMAGE_URL_DEFAULT=quay.io/podified-main-centos9/openstack-watcher-api:current-podified
+run-with-webhook: export WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT=quay.io/podified-main-centos9/openstack-watcher-decision-engine:current-podified
+run-with-webhook: export WATCHER_APPLIER_IMAGE_URL_DEFAULT=quay.io/podified-main-centos9/openstack-watcher-applier:current-podified
 run-with-webhook: manifests generate fmt vet ## Run a controller from your host.
 	/bin/bash hack/clean_local_webhook.sh
 	/bin/bash hack/run_with_local_webhook.sh

api/bases/watcher.openstack.org_watcherapis.yaml

@@ -39,6 +39,10 @@ spec:
           spec:
             description: WatcherAPISpec defines the desired state of WatcherAPI
             properties:
+              containerImage:
+                description: The service specific Container Image URL (will be set
+                  to environmental default if empty)
+                type: string
               databaseAccount:
                 default: watcher
                 description: DatabaseAccount - MariaDBAccount CR name used for watcher

api/bases/watcher.openstack.org_watcherappliers.yaml

@@ -39,9 +39,9 @@ spec:
           spec:
             description: WatcherApplierSpec defines the desired state of WatcherApplier
             properties:
-              foo:
-                description: Foo is an example field of WatcherApplier. Edit watcherapplier_types.go
-                  to remove/update
+              containerImage:
+                description: The service specific Container Image URL (will be set
+                  to environmental default if empty)
                 type: string
             type: object
           status:

api/bases/watcher.openstack.org_watcherdecisionengines.yaml

@@ -40,9 +40,9 @@ spec:
           spec:
             description: WatcherDecisionEngineSpec defines the desired state of WatcherDecisionEngine
             properties:
-              foo:
-                description: Foo is an example field of WatcherDecisionEngine. Edit
-                  watcherdecisionengine_types.go to remove/update
+              containerImage:
+                description: The service specific Container Image URL (will be set
+                  to environmental default if empty)
                 type: string
             type: object
           status:

api/bases/watcher.openstack.org_watchers.yaml

@@ -39,6 +39,12 @@ spec:
           spec:
             description: WatcherSpec defines the desired state of Watcher
             properties:
+              apiContainerImageURL:
+                description: APIContainerImageURL
+                type: string
+              applierContainerImageURL:
+                description: ApplierContainerImageURL
+                type: string
               databaseAccount:
                 default: watcher
                 description: DatabaseAccount - MariaDBAccount CR name used for watcher
@@ -49,6 +55,9 @@ spec:
                   MariaDB instance name
                   Required to use the mariadb-operator instance to create the DB and user
                 type: string
+              decisionengineContainerImageURL:
+                description: DecisionEngineContainerImageURL
+                type: string
               memcachedInstance:
                 default: memcached
                 description: MemcachedInstance is the name of the Memcached CR that
@@ -82,7 +91,10 @@ spec:
                   to register in keystone
                 type: string
             required:
+            - apiContainerImageURL
+            - applierContainerImageURL
             - databaseInstance
+            - decisionengineContainerImageURL
             - rabbitMqClusterName
             type: object
           status:

api/v1beta1/common_types.go

@@ -16,6 +16,15 @@ limitations under the License.
 
 package v1beta1
 
+import "github.com/openstack-k8s-operators/lib-common/modules/common/util"
+
+// Container image fall-back defaults
+const (
+	WatcherAPIContainerImage            = "quay.io/podified-antelope-centos9/openstack-watcher-api:current-podified"
+	WatcherDecisionEngineContainerImage = "quay.io/podified-antelope-centos9/openstack-watcher-decision-engine:current-podified"
+	WatcherApplierContainerImage        = "quay.io/podified-antelope-centos9/openstack-watcher-applier:current-podified"
+)
+
 // WatcherCommon defines a spec based reusable for all the CRDs
 type WatcherCommon struct {
 
@@ -70,3 +79,48 @@ type PasswordSelector struct {
 	// Service - Selector to get the watcher service user password from the Secret
 	Service string `json:"service"`
 }
+
+// WatcherSubCrsCommon
+type WatcherSubCrsCommon struct {
+	// +kubebuilder:validation:Optional
+	// The service specific Container Image URL (will be set to environmental default if empty)
+	ContainerImage string `json:"containerImage"`
+}
+
+type WatcherImages struct {
+	// +kubebuilder:validation:Required
+	// APIContainerImageURL
+	APIContainerImageURL string `json:"apiContainerImageURL"`
+
+	// +kubebuilder:validation:Required
+	// DecisionEngineContainerImageURL
+	DecisionEngineContainerImageURL string `json:"decisionengineContainerImageURL"`
+
+	// +kubebuilder:validation:Required
+	// ApplierContainerImageURL
+	ApplierContainerImageURL string `json:"applierContainerImageURL"`
+}
+
+func (r *WatcherImages) Default(defaults WatcherDefaults) {
+	if r.APIContainerImageURL == "" {
+		r.APIContainerImageURL = defaults.APIContainerImageURL
+	}
+	if r.DecisionEngineContainerImageURL == "" {
+		r.DecisionEngineContainerImageURL = defaults.DecisionEngineContainerImageURL
+	}
+	if r.ApplierContainerImageURL == "" {
+		r.ApplierContainerImageURL = defaults.ApplierContainerImageURL
+	}
+}
+
+// SetupDefaults - initializes any CRD field defaults based on environment variables (the defaulting mechanism itself is implemented via webhooks)
+
+func SetupDefaults() {
+	// Acquire environmental defaults and initialize Nova defaults with them
+	watcherDefaults := WatcherDefaults{
+		APIContainerImageURL:            util.GetEnvVar("WATCHER_API_IMAGE_URL_DEFAULT", WatcherAPIContainerImage),
+		ApplierContainerImageURL:        util.GetEnvVar("WATCHER_APPLIER_IMAGE_URL_DEFAULT", WatcherApplierContainerImage),
+		DecisionEngineContainerImageURL: util.GetEnvVar("WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT", WatcherDecisionEngineContainerImage),
+	}
+	SetupWatcherDefaults(watcherDefaults)
+}

api/v1beta1/watcher_types.go

@@ -27,6 +27,9 @@ type WatcherSpec struct {
 	// Important: Run "make" to regenerate code after modifying this file
 
 	WatcherTemplate `json:",inline"`
+
+	// +kubebuilder:validation:Required
+	WatcherImages `json:",inline"`
 }
 
 // WatcherStatus defines the observed state of Watcher
@@ -68,7 +71,3 @@ type WatcherList struct {
 func init() {
 	SchemeBuilder.Register(&Watcher{}, &WatcherList{})
 }
-
-// SetupDefaults - initializes any CRD field defaults based on environment variables (the defaulting mechanism itself is implemented via webhooks)
-func SetupDefaults() {
-}

api/v1beta1/watcher_webhook.go

@@ -23,9 +23,23 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
+// WatcherDefaults -
+type WatcherDefaults struct {
+	APIContainerImageURL            string
+	DecisionEngineContainerImageURL string
+	ApplierContainerImageURL        string
+}
+
+var watcherDefaults WatcherDefaults
+
 // log is for logging in this package.
 var watcherlog = logf.Log.WithName("watcher-resource")
 
+func SetupWatcherDefaults(defaults WatcherDefaults) {
+	watcherDefaults = defaults
+	watcherlog.Info("Watcher defaults initialized", "defaults", defaults)
+}
+
 //+kubebuilder:webhook:path=/mutate-watcher-openstack-org-v1beta1-watcher,mutating=true,failurePolicy=fail,sideEffects=None,groups=watcher.openstack.org,resources=watchers,verbs=create;update,versions=v1beta1,name=mwatcher.kb.io,admissionReviewVersions=v1
 
 var _ webhook.Defaulter = &Watcher{}
@@ -34,6 +48,12 @@ var _ webhook.Defaulter = &Watcher{}
 func (r *Watcher) Default() {
 	watcherlog.Info("default", "name", r.Name)
 
+	r.Spec.Default()
+}
+
+// Default - set defaults for this WatcherCore spec.
+func (spec *WatcherSpec) Default() {
+	spec.WatcherImages.Default(watcherDefaults)
 }
 
 //+kubebuilder:webhook:path=/validate-watcher-openstack-org-v1beta1-watcher,mutating=false,failurePolicy=fail,sideEffects=None,groups=watcher.openstack.org,resources=watchers,verbs=create;update,versions=v1beta1,name=vwatcher.kb.io,admissionReviewVersions=v1

api/v1beta1/watcherapi_types.go

@@ -31,6 +31,8 @@ type WatcherAPISpec struct {
 	// +kubebuilder:validation:Required
 	// Secret containing all passwords / keys needed
 	Secret string `json:"secret"`
+
+	WatcherSubCrsCommon `json:",inline"`
 }
 
 // WatcherAPIStatus defines the observed state of WatcherAPI

api/v1beta1/watcherapplier_types.go

@@ -28,8 +28,7 @@ type WatcherApplierSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	// Foo is an example field of WatcherApplier. Edit watcherapplier_types.go to remove/update
-	Foo string `json:"foo,omitempty"`
+	WatcherSubCrsCommon `json:",inline"`
 }
 
 // WatcherApplierStatus defines the observed state of WatcherApplier

api/v1beta1/watcherdecisionengine_types.go

@@ -28,8 +28,7 @@ type WatcherDecisionEngineSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	// Foo is an example field of WatcherDecisionEngine. Edit watcherdecisionengine_types.go to remove/update
-	Foo string `json:"foo,omitempty"`
+	WatcherSubCrsCommon `json:",inline"`
 }
 
 // WatcherDecisionEngineStatus defines the observed state of WatcherDecisionEngine

config/crd/bases/watcher.openstack.org_watcherapis.yaml

@@ -39,6 +39,10 @@ spec:
           spec:
             description: WatcherAPISpec defines the desired state of WatcherAPI
             properties:
+              containerImage:
+                description: The service specific Container Image URL (will be set
+                  to environmental default if empty)
+                type: string
               databaseAccount:
                 default: watcher
                 description: DatabaseAccount - MariaDBAccount CR name used for watcher

config/crd/bases/watcher.openstack.org_watcherappliers.yaml

@@ -39,9 +39,9 @@ spec:
           spec:
             description: WatcherApplierSpec defines the desired state of WatcherApplier
             properties:
-              foo:
-                description: Foo is an example field of WatcherApplier. Edit watcherapplier_types.go
-                  to remove/update
+              containerImage:
+                description: The service specific Container Image URL (will be set
+                  to environmental default if empty)
                 type: string
             type: object
           status:

config/crd/bases/watcher.openstack.org_watcherdecisionengines.yaml

@@ -40,9 +40,9 @@ spec:
           spec:
             description: WatcherDecisionEngineSpec defines the desired state of WatcherDecisionEngine
             properties:
-              foo:
-                description: Foo is an example field of WatcherDecisionEngine. Edit
-                  watcherdecisionengine_types.go to remove/update
+              containerImage:
+                description: The service specific Container Image URL (will be set
+                  to environmental default if empty)
                 type: string
             type: object
           status:

config/crd/bases/watcher.openstack.org_watchers.yaml

@@ -39,6 +39,12 @@ spec:
           spec:
             description: WatcherSpec defines the desired state of Watcher
             properties:
+              apiContainerImageURL:
+                description: APIContainerImageURL
+                type: string
+              applierContainerImageURL:
+                description: ApplierContainerImageURL
+                type: string
               databaseAccount:
                 default: watcher
                 description: DatabaseAccount - MariaDBAccount CR name used for watcher
@@ -49,6 +55,9 @@ spec:
                   MariaDB instance name
                   Required to use the mariadb-operator instance to create the DB and user
                 type: string
+              decisionengineContainerImageURL:
+                description: DecisionEngineContainerImageURL
+                type: string
               memcachedInstance:
                 default: memcached
                 description: MemcachedInstance is the name of the Memcached CR that
@@ -82,7 +91,10 @@ spec:
                   to register in keystone
                 type: string
             required:
+            - apiContainerImageURL
+            - applierContainerImageURL
             - databaseInstance
+            - decisionengineContainerImageURL
             - rabbitMqClusterName
             type: object
           status: