Merge pull request #478 from joejstuart/EC-1100

Per imageUrl/component exceptions
enterprise-contract · Feb 24, 2025 · be8b799 · be8b799
2 parents 1cff291 + e409aaf
commit be8b799
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/api/config/appstudio.redhat.com_enterprisecontractpolicies.yaml b/api/config/appstudio.redhat.com_enterprisecontractpolicies.yaml
@@ -169,6 +169,10 @@ spec:
                                   description: ImageRef is used to specify an image by its digest.
                                   pattern: ^sha256:[a-fA-F0-9]{64}$
                                   type: string
+                                imageUrl:
+                                  description: ImageUrl is used to specify an image by its URL with or without a tag.
+                                  pattern: ^(?:https:\/\/)?[a-z0-9.-]+\/[a-z0-9-]+\/[a-z0-9-]+(?::[a-zA-Z0-9._-]+)?$
+                                  type: string
                                 value:
                                   type: string
                               required:
@@ -192,6 +196,10 @@ spec:
                                   description: ImageRef is used to specify an image by its digest.
                                   pattern: ^sha256:[a-fA-F0-9]{64}$
                                   type: string
+                                imageUrl:
+                                  description: ImageUrl is used to specify an image by its URL with or without a tag.
+                                  pattern: ^(?:https:\/\/)?[a-z0-9.-]+\/[a-z0-9-]+\/[a-z0-9-]+(?::[a-zA-Z0-9._-]+)?$
+                                  type: string
                                 value:
                                   type: string
                               required:

diff --git a/api/v1alpha1/enterprisecontractpolicy_types.go b/api/v1alpha1/enterprisecontractpolicy_types.go
@@ -104,6 +104,11 @@ type VolatileCriteria struct {
 	// +optional
 	// +kubebuilder:validation:Pattern=`^sha256:[a-fA-F0-9]{64}$`
 	ImageRef string `json:"imageRef,omitempty"`
+
+	// ImageUrl is used to specify an image by its URL with or without a tag.
+	// +optional
+	// +kubebuilder:validation:Pattern=`^(?:https:\/\/)?[a-z0-9.-]+\/[a-z0-9-]+\/[a-z0-9-]+(?::[a-zA-Z0-9._-]+)?$`
+	ImageUrl string `json:"imageUrl,omitempty"`
 }
 
 // VolatileSourceConfig specifies volatile configuration for a policy source.

diff --git a/api/v1alpha1/policy_spec.json b/api/v1alpha1/policy_spec.json
@@ -171,6 +171,10 @@
         "imageRef": {
           "type": "string",
           "description": "ImageRef is used to specify an image by its digest.\n+optional\n+kubebuilder:validation:Pattern=`^sha256:[a-fA-F0-9]{64}$`"
+        },
+        "imageUrl": {
+          "type": "string",
+          "description": "ImageUrl is used to specify an image by its URL with or without a tag.\n+optional\n+kubebuilder:validation:Pattern=`^(?:https:\\/\\/)?[a-z0-9.-]+\\/[a-z0-9-]+\\/[a-z0-9-]+(?::[a-zA-Z0-9._-]+)?$`"
         }
       },
       "additionalProperties": false,

diff --git a/config/crd/bases/appstudio.redhat.com_enterprisecontractpolicies.yaml b/config/crd/bases/appstudio.redhat.com_enterprisecontractpolicies.yaml
@@ -169,6 +169,10 @@ spec:
                                   description: ImageRef is used to specify an image by its digest.
                                   pattern: ^sha256:[a-fA-F0-9]{64}$
                                   type: string
+                                imageUrl:
+                                  description: ImageUrl is used to specify an image by its URL with or without a tag.
+                                  pattern: ^(?:https:\/\/)?[a-z0-9.-]+\/[a-z0-9-]+\/[a-z0-9-]+(?::[a-zA-Z0-9._-]+)?$
+                                  type: string
                                 value:
                                   type: string
                               required:
@@ -192,6 +196,10 @@ spec:
                                   description: ImageRef is used to specify an image by its digest.
                                   pattern: ^sha256:[a-fA-F0-9]{64}$
                                   type: string
+                                imageUrl:
+                                  description: ImageUrl is used to specify an image by its URL with or without a tag.
+                                  pattern: ^(?:https:\/\/)?[a-z0-9.-]+\/[a-z0-9-]+\/[a-z0-9-]+(?::[a-zA-Z0-9._-]+)?$
+                                  type: string
                                 value:
                                   type: string
                               required: