Revert "Set defaulth image for fernet key rotation"

This reverts commit 28dc96e.

Author: xek

api/bases/keystone.openstack.org_keystoneapis.yaml

@@ -95,10 +95,6 @@ spec:
                   keys after rotation
                 format: int32
                 type: integer
-              fernetRotationContainerImage:
-                description: Keystone Fernet Rotation Container Image URL (will be
-                  set to environmental default if empty)
-                type: string
               fernetRotationDays:
                 default: 1
                 description: FernetRotationDays - Rotate fernet token keys every X
@@ -428,7 +424,6 @@ spec:
             required:
             - containerImage
             - databaseInstance
-            - fernetRotationContainerImage
             - memcachedInstance
             - rabbitMqClusterName
             - secret

api/v1beta1/keystoneapi_types.go

@@ -45,9 +45,6 @@ const (
 
 	// KeystoneAPIContainerImage is the fall-back container image for KeystoneAPI
 	KeystoneAPIContainerImage = "quay.io/podified-antelope-centos9/openstack-keystone:current-podified"
-
-	// KeystoneFernetRotationContainerImage is the fall-back container image for Keystone Fernet Rotation
-	KeystoneFernetRotationContainerImage = "registry.redhat.io/openshift4/ose-cli"
 )
 
 type KeystoneAPISpec struct {
@@ -56,9 +53,6 @@ type KeystoneAPISpec struct {
 	// +kubebuilder:validation:Required
 	// Keystone Container Image URL (will be set to environmental default if empty)
 	ContainerImage string `json:"containerImage"`
-	// +kubebuilder:validation:Required
-	// Keystone Fernet Rotation Container Image URL (will be set to environmental default if empty)
-	FernetRotationContainerImage string `json:"fernetRotationContainerImage"`
 }
 
 // KeystoneAPISpec defines the desired state of KeystoneAPI
@@ -289,7 +283,6 @@ func SetupDefaults() {
 	// Acquire environmental defaults and initialize Keystone defaults with them
 	keystoneDefaults := KeystoneAPIDefaults{
 		ContainerImageURL: util.GetEnvVar("RELATED_IMAGE_KEYSTONE_API_IMAGE_URL_DEFAULT", KeystoneAPIContainerImage),
-		FernetRotationContainerImageURL: util.GetEnvVar("RELATED_IMAGE_KEYSTONE_FERNET_ROTATION_IMAGE_URL_DEFAULT", KeystoneFernetRotationContainerImage),
 	}
 
 	SetupKeystoneAPIDefaults(keystoneDefaults)

api/v1beta1/keystoneapi_webhook.go

@@ -38,7 +38,6 @@ import (
 // KeystoneAPIDefaults -
 type KeystoneAPIDefaults struct {
 	ContainerImageURL string
-	FernetRotationContainerImageURL string
 }
 
 var keystoneAPIDefaults KeystoneAPIDefaults
@@ -70,9 +69,6 @@ func (r *KeystoneAPI) Default() {
 	if r.Spec.ContainerImage == "" {
 		r.Spec.ContainerImage = keystoneAPIDefaults.ContainerImageURL
 	}
-	if r.Spec.FernetRotationContainerImage == "" {
-		r.Spec.FernetRotationContainerImage = keystoneAPIDefaults.FernetRotationContainerImageURL
-	}
 	r.Spec.Default()
 }
 

config/crd/bases/keystone.openstack.org_keystoneapis.yaml

@@ -95,10 +95,6 @@ spec:
                   keys after rotation
                 format: int32
                 type: integer
-              fernetRotationContainerImage:
-                description: Keystone Fernet Rotation Container Image URL (will be
-                  set to environmental default if empty)
-                type: string
               fernetRotationDays:
                 default: 1
                 description: FernetRotationDays - Rotate fernet token keys every X
@@ -428,7 +424,6 @@ spec:
             required:
             - containerImage
             - databaseInstance
-            - fernetRotationContainerImage
             - memcachedInstance
             - rabbitMqClusterName
             - secret

tests/functional/keystoneapi_webhook_test.go

@@ -94,17 +94,13 @@ var _ = Describe("KeystoneAPI Webhook", func() {
 			Expect(KeystoneAPI.Spec.ContainerImage).Should(Equal(
 				keystonev1.KeystoneAPIContainerImage,
 			))
-			Expect(KeystoneAPI.Spec.FernetRotationContainerImage).Should(Equal(
-				keystonev1.KeystoneFernetRotationContainerImage,
-			))
 		})
 	})
 
 	When("A KeystoneAPI instance is created with container images", func() {
 		BeforeEach(func() {
 			spec := GetDefaultKeystoneAPISpec()
 			spec["containerImage"] = "api-container-image"
-			spec["fernetRotationContainerImage"] = "fernet-rotation-container-image"
 			DeferCleanup(th.DeleteInstance, CreateKeystoneAPI(keystoneAPIName, spec))
 		})
 
@@ -113,9 +109,6 @@ var _ = Describe("KeystoneAPI Webhook", func() {
 			Expect(KeystoneAPI.Spec.ContainerImage).Should(Equal(
 				"api-container-image",
 			))
-			Expect(KeystoneAPI.Spec.FernetRotationContainerImage).Should(Equal(
-				"fernet-rotation-container-image",
-			))
 		})
 	})