remove validation of email in private image hubs (#964)

* remove validation of email in private image hubs
equinor · Oct 27, 2023 · ca64b0c · ca64b0c
1 parent 78d4216
commit ca64b0c
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 16 deletions.
diff --git a/charts/radix-operator/Chart.yaml b/charts/radix-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
-version: 1.23.12
-appVersion: 1.43.12
+version: 1.23.13
+appVersion: 1.43.13
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

diff --git a/charts/radix-operator/templates/radixapplication.yaml b/charts/radix-operator/templates/radixapplication.yaml
@@ -1951,15 +1951,13 @@ spec:
                   properties:
                     email:
                       description: The email address linked to the username.
-                      minLength: 3
                       type: string
                     username:
                       description: Username with permission to pull images. The password
                         is set in Radix Web Console.
                       minLength: 1
                       type: string
                   required:
-                  - email
                   - username
                   type: object
                 description: 'Defines protected container registries used by components

diff --git a/json-schema/radixapplication.json b/json-schema/radixapplication.json
@@ -1995,7 +1995,6 @@
             "properties": {
               "email": {
                 "description": "The email address linked to the username.",
-                "minLength": 3,
                 "type": "string"
               },
               "username": {
@@ -2005,7 +2004,6 @@
               }
             },
             "required": [
-              "email",
               "username"
             ],
             "type": "object"

diff --git a/pkg/apis/radix/v1/radixapptypes.go b/pkg/apis/radix/v1/radixapptypes.go
@@ -650,7 +650,7 @@ type RadixPrivateImageHubCredential struct {
 	Username string `json:"username"`
 
 	// The email address linked to the username.
-	// +kubebuilder:validation:MinLength=3
+	// +optional
 	Email string `json:"email"`
 }
 

diff --git a/pkg/apis/radixvalidators/errors.go b/pkg/apis/radixvalidators/errors.go
@@ -13,11 +13,6 @@ func MissingPrivateImageHubUsernameError(server string) error {
 	return fmt.Errorf("username is required for private image hub %s", server)
 }
 
-// MissingPrivateImageHubEmailError Error when email for private image hubs is not defined
-func MissingPrivateImageHubEmailError(server string) error {
-	return fmt.Errorf("email is required for private image hub %s", server)
-}
-
 // EnvForDNSAppAliasNotDefinedError Error when env not defined
 func EnvForDNSAppAliasNotDefinedError(env string) error {
 	return fmt.Errorf("env %s referred to by dnsAppAlias is not defined", env)

diff --git a/pkg/apis/radixvalidators/validate_ra.go b/pkg/apis/radixvalidators/validate_ra.go
@@ -151,14 +151,11 @@ func CanRadixApplicationBeInsertedErrors(client radixclient.Interface, app *radi
 }
 
 func validatePrivateImageHubs(app *radixv1.RadixApplication) []error {
-	errs := []error{}
+	var errs []error
 	for server, config := range app.Spec.PrivateImageHubs {
 		if config.Username == "" {
 			errs = append(errs, MissingPrivateImageHubUsernameError(server))
 		}
-		if config.Email == "" {
-			errs = append(errs, MissingPrivateImageHubEmailError(server))
-		}
 	}
 	return errs
 }