Merge pull request #970 from RedHatInsights/psav/move_to_configurable…

…_images

feat: moved to configurable images

apis/cloud.redhat.com/v1alpha1/clowdenvironment_types.go

@@ -329,6 +329,10 @@ type ServiceMeshConfig struct {
 	Mode ServiceMeshMode `json:"mode,omitempty"`
 }
 
+type ObjectStoreImages struct {
+	Minio string `json:"minio,omitempty"`
+}
+
 // ObjectStoreMode details the mode of operation of the Clowder ObjectStore
 // Provider
 // +kubebuilder:validation:Enum=minio;app-interface;none
@@ -349,6 +353,13 @@ type ObjectStoreConfig struct {
 	// If using the (*_local_*) mode and PVC is set to true, this instructs the local
 	// Database instance to use a PVC instead of emptyDir for its volumes.
 	PVC bool `json:"pvc,omitempty"`
+
+	// Override the object store images
+	Images ObjectStoreImages `json:"images,omitempty"`
+}
+
+type FeatureFlagsImages struct {
+	Unleash string `json:"unleash,omitempty"`
 }
 
 // FeatureFlagsMode details the mode of operation of the Clowder FeatureFlags
@@ -379,6 +390,9 @@ type FeatureFlagsConfig struct {
 
 	// Defineds the port for (*_app-interface_*) mode
 	Port int32 `json:"port,omitempty"`
+
+	// Defines images used for the feature flags provider
+	Images FeatureFlagsImages `json:"images,omitempty"`
 }
 
 // InMemoryMode details the mode of operation of the Clowder InMemoryDB

config/crd/bases/cloud.redhat.com_clowdenvironments.yaml

@@ -128,6 +128,12 @@ spec:
                         description: Defines the hostname for (*_app-interface_*)
                           mode
                         type: string
+                      images:
+                        description: Defines images used for the feature flags provider
+                        properties:
+                          unleash:
+                            type: string
+                        type: object
                       mode:
                         description: 'The mode of operation of the Clowder FeatureFlag
                           Provider. Valid options are: (*_app-interface_*) where the
@@ -438,6 +444,12 @@ spec:
                     description: Defines the Configuration for the Clowder ObjectStore
                       Provider.
                     properties:
+                      images:
+                        description: Override the object store images
+                        properties:
+                          minio:
+                            type: string
+                        type: object
                       mode:
                         description: 'The mode of operation of the Clowder ObjectStore
                           Provider. Valid options are: (*_app-interface_*) where the

config/deployment-template/clowder_config.yaml

@@ -28,5 +28,9 @@ data:
         },
         "settings": {
             "managedKafkaEphemDeleteRegex": "${MANAGED_EPHEM_DELETE_REGEX}"
+        },
+        "images": {
+            "objectStoreMinio": "${OBJECTSTORE_IMAGE}",
+            "featureFlagsUnleash": "${FEATUREFLAGS_IMAGE}"
         }
     }

controllers/cloud.redhat.com/clowderconfig/config.go

@@ -8,12 +8,14 @@ import (
 
 type ClowderConfig struct {
 	Images struct {
-		MBOP              string `json:"mbop"`
-		Caddy             string `json:"caddy"`
-		CaddyGateway      string `json:"caddyGateway"`
-		Keycloak          string `json:"Keycloak"`
-		Mocktitlements    string `json:"mocktitlements"`
-		CaddyReverseProxy string `json:"caddyReverseProxy"`
+		MBOP                string `json:"mbop"`
+		Caddy               string `json:"caddy"`
+		CaddyGateway        string `json:"caddyGateway"`
+		Keycloak            string `json:"Keycloak"`
+		Mocktitlements      string `json:"mocktitlements"`
+		CaddyReverseProxy   string `json:"caddyReverseProxy"`
+		ObjectStoreMinio    string `json:"objectStoreMinio"`
+		FeatureFlagsUnleash string `json:"featureFlagsUnleash"`
 	} `json:"images"`
 	DebugOptions struct {
 		Logging struct {

controllers/cloud.redhat.com/providers/featureflags/localfeatureflags.go

@@ -209,7 +209,7 @@ func (ff *localFeatureFlagsProvider) Provide(_ *crd.ClowdApp) error {
 	return nil
 }
 
-func makeLocalFeatureFlags(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) {
+func makeLocalFeatureFlags(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) error {
 	nn := providers.GetNamespacedName(o, "featureflags")
 
 	dd := objMap[LocalFFDeployment].(*apps.Deployment)
@@ -279,9 +279,14 @@ func makeLocalFeatureFlags(o obj.ClowdObject, objMap providers.ObjectMap, _ bool
 		FailureThreshold:    3,
 	}
 
+	env, ok := o.(*crd.ClowdEnvironment)
+	if !ok {
+		return fmt.Errorf("could not get env")
+	}
+
 	c := core.Container{
 		Name:                     nn.Name,
-		Image:                    DefaultImageFeatureFlagsUnleash,
+		Image:                    GetFeatureFlagsUnleashImage(env),
 		Env:                      envVars,
 		Ports:                    ports,
 		LivenessProbe:            &livenessProbe,
@@ -312,4 +317,5 @@ func makeLocalFeatureFlags(o obj.ClowdObject, objMap providers.ObjectMap, _ bool
 	}}
 
 	utils.MakeService(svc, nn, labels, servicePorts, o, nodePort)
+	return nil
 }

controllers/cloud.redhat.com/providers/featureflags/provider.go

@@ -3,11 +3,23 @@ package featureflags
 import (
 	"fmt"
 
+	crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
+	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/clowderconfig"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/errors"
 	p "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers"
 )
 
-var DefaultImageFeatureFlagsUnleash = "quay.io/cloudservices/unleash-docker:5.6.9"
+var DefaultImageFeatureFlagsUnleash = "unleashorg/unleash-server:5.6.9"
+
+func GetFeatureFlagsUnleashImage(env *crd.ClowdEnvironment) string {
+	if env.Spec.Providers.FeatureFlags.Images.Unleash != "" {
+		return env.Spec.Providers.FeatureFlags.Images.Unleash
+	}
+	if clowderconfig.LoadedConfig.Images.FeatureFlagsUnleash != "" {
+		return clowderconfig.LoadedConfig.Images.FeatureFlagsUnleash
+	}
+	return DefaultImageFeatureFlagsUnleash
+}
 
 // ProvName identifies the featureflags provider.
 var ProvName = "featureflags"

controllers/cloud.redhat.com/providers/inmemorydb/redis.go

@@ -87,7 +87,7 @@ func (r *localRedis) Provide(app *crd.ClowdApp) error {
 	return providers.CachedMakeComponent(r.Provider.Cache, objList, app, "redis", makeLocalRedis, false, r.Env.IsNodePort())
 }
 
-func makeLocalRedis(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) {
+func makeLocalRedis(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) error {
 	nn := providers.GetNamespacedName(o, "redis")
 
 	dd := objMap[RedisDeployment].(*apps.Deployment)
@@ -175,4 +175,5 @@ func makeLocalRedis(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodeP
 	}}
 
 	utils.MakeService(svc, nn, labels, servicePorts, o, nodePort)
+	return nil
 }

controllers/cloud.redhat.com/providers/inmemorydb/redis_test.go

@@ -37,7 +37,7 @@ func TestLocalRedis(t *testing.T) {
 		RedisDeployment: &dd,
 		RedisService:    &svc,
 	}
-	makeLocalRedis(&env, objMap, true, false)
+	_ = makeLocalRedis(&env, objMap, true, false)
 
 	assert.Equal(t, "env-redis", dd.GetName(), "name was not set correctly")
 	assert.Len(t, svc.Spec.Ports, 1, "number of ports specified is wrong")

controllers/cloud.redhat.com/providers/objectstore/minio.go

@@ -279,7 +279,7 @@ func createNetworkPolicy(p *providers.Provider) error {
 	return p.Cache.Update(MinioNetworkPolicy, np)
 }
 
-func makeLocalMinIO(o obj.ClowdObject, objMap providers.ObjectMap, usePVC bool, nodePort bool) {
+func makeLocalMinIO(o obj.ClowdObject, objMap providers.ObjectMap, usePVC bool, nodePort bool) error {
 	nn := providers.GetNamespacedName(o, "minio")
 
 	dd := objMap[MinioDeployment].(*apps.Deployment)
@@ -359,9 +359,14 @@ func makeLocalMinIO(o obj.ClowdObject, objMap providers.ObjectMap, usePVC bool,
 		FailureThreshold:    3,
 	}
 
+	env, ok := o.(*crd.ClowdEnvironment)
+	if !ok {
+		return fmt.Errorf("could not get env from object")
+	}
+
 	c := core.Container{
 		Name:  nn.Name,
-		Image: DefaultImageObjectStoreMinio,
+		Image: GetObjectStoreMinioImage(env),
 		Env:   envVars,
 		Ports: ports,
 		VolumeMounts: []core.VolumeMount{{
@@ -394,4 +399,5 @@ func makeLocalMinIO(o obj.ClowdObject, objMap providers.ObjectMap, usePVC bool,
 		pvc := objMap[MinioPVC].(*core.PersistentVolumeClaim)
 		utils.MakePVC(pvc, nn, labels, "1Gi", o)
 	}
+	return nil
 }

controllers/cloud.redhat.com/providers/objectstore/provider.go

@@ -3,11 +3,23 @@ package objectstore
 import (
 	"fmt"
 
+	crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
+	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/clowderconfig"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/errors"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers"
 )
 
-var DefaultImageObjectStoreMinio = "quay.io/cloudservices/minio:RELEASE.2020-11-19T23-48-16Z-amd64"
+var DefaultImageObjectStoreMinio = "minio/minio:RELEASE.2020-11-19T23-48-16Z-amd64"
+
+func GetObjectStoreMinioImage(env *crd.ClowdEnvironment) string {
+	if env.Spec.Providers.ObjectStore.Images.Minio != "" {
+		return env.Spec.Providers.ObjectStore.Images.Minio
+	}
+	if clowderconfig.LoadedConfig.Images.ObjectStoreMinio != "" {
+		return clowderconfig.LoadedConfig.Images.ObjectStoreMinio
+	}
+	return DefaultImageObjectStoreMinio
+}
 
 // ProvName is the providers ident.
 var ProvName = "objectstore"

controllers/cloud.redhat.com/providers/providers.go

@@ -128,7 +128,7 @@ type ClowderProvider interface {
 	GetConfig() *config.AppConfig
 }
 
-type makeFnCache func(o obj.ClowdObject, objMap ObjectMap, usePVC bool, nodePort bool)
+type makeFnCache func(o obj.ClowdObject, objMap ObjectMap, usePVC bool, nodePort bool) error
 
 func createResource(cache *rc.ObjectCache, resourceIdent rc.ResourceIdent, nn types.NamespacedName) (client.Object, error) {
 	gvks, nok, err := cache.GetScheme().ObjectKinds(resourceIdent.GetType())
@@ -200,7 +200,10 @@ func CachedMakeComponent(cache *rc.ObjectCache, objList []rc.ResourceIdent, o ob
 
 	}
 
-	fn(o, makeFnMap, usePVC, nodePort)
+	err := fn(o, makeFnMap, usePVC, nodePort)
+	if err != nil {
+		return fmt.Errorf("could not make component: %w", err)
+	}
 
 	for k, v := range makeFnMap {
 		err := updateResource(cache, k, v)

controllers/cloud.redhat.com/providers/web/resources_caddygateway.go

@@ -317,7 +317,7 @@ func makeWebGatewayConfigMap(p *providers.Provider) (string, error) {
 	return hash, p.Cache.Update(CoreCaddyConfigMap, cm)
 }
 
-func makeWebGatewayDeployment(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, _ bool) {
+func makeWebGatewayDeployment(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, _ bool) error {
 	nn := providers.GetNamespacedName(o, "caddy-gateway")
 
 	dd := objMap[WebGatewayDeployment].(*apps.Deployment)
@@ -433,6 +433,7 @@ func makeWebGatewayDeployment(o obj.ClowdObject, objMap providers.ObjectMap, _ b
 	}}
 
 	utils.MakeService(svc, nn, labels, servicePorts, o, false)
+	return nil
 }
 
 func makeWebGatewayIngress(p *providers.Provider) error {

controllers/cloud.redhat.com/providers/web/resources_keycloak.go

@@ -246,7 +246,7 @@ func baseProbeHandler(port int32, path string) core.ProbeHandler {
 	}
 }
 
-func makeKeycloak(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) {
+func makeKeycloak(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) error {
 	nn := providers.GetNamespacedName(o, "keycloak")
 
 	dd := objMap[WebKeycloakDeployment].(*apps.Deployment)
@@ -391,7 +391,7 @@ func makeKeycloak(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePor
 	}}
 
 	utils.MakeService(svc, nn, labels, servicePorts, o, nodePort)
-
+	return nil
 }
 
 func makeAuthIngress(p *providers.Provider) error {

controllers/cloud.redhat.com/providers/web/resources_mbop.go

@@ -171,7 +171,7 @@ func makeBOPIngress(p *providers.Provider) error {
 	return p.Cache.Update(WebBOPIngress, netobj)
 }
 
-func makeBOP(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) {
+func makeBOP(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) error {
 	snn := providers.GetNamespacedName(o, "keycloak")
 	nn := providers.GetNamespacedName(o, "mbop")
 
@@ -289,5 +289,5 @@ func makeBOP(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort boo
 	}
 
 	utils.MakeService(svc, nn, labels, servicePorts, o, nodePort)
-
+	return nil
 }

controllers/cloud.redhat.com/providers/web/resources_mocktitlements.go

@@ -158,7 +158,7 @@ func makeMocktitlementsIngress(p *providers.Provider) error {
 	return p.Cache.Update(WebMocktitlementsIngress, netobj)
 }
 
-func makeMocktitlements(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) {
+func makeMocktitlements(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, nodePort bool) error {
 	snn := providers.GetNamespacedName(o, "keycloak")
 	nn := providers.GetNamespacedName(o, "mocktitlements")
 
@@ -277,4 +277,5 @@ func makeMocktitlements(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, n
 
 	utils.MakeService(svc, nn, labels, servicePorts, o, nodePort)
 
+	return nil
 }