Finish implementation and tests

konflux-ci · Aug 15, 2023 · d29161a · d29161a
1 parent fe6ea2f
commit d29161a
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 115 deletions.
diff --git a/api/v1beta1/groupversion_info.go b/api/v1beta1/groupversion_info.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v1beta1 contains API Schema definitions for the appstudio.redhat.com v1beta1 API group
 // +kubebuilder:object:generate=true
-// +groupName=appstudio.redhat.com.appstudio.redhat.com
+// +groupName=appstudio.redhat.com
 package v1beta1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "appstudio.redhat.com.appstudio.redhat.com", Version: "v1beta1"}
+	GroupVersion = schema.GroupVersion{Group: "appstudio.redhat.com", Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/v1beta1/imagerepository_types.go b/api/v1beta1/imagerepository_types.go
@@ -37,7 +37,7 @@ type ImageParameters struct {
 	// If ommited, then defaults to "cr-namespace/cr-name".
 	// This field cannot be changed after the resource creation.
 	// +optional
-	// +kubebuilder:validation:Pattern="[a-z0-9][.a-z0-9_-]*(/[a-z0-9][.a-z0-9_-]*)*"
+	// +kubebuilder:validation:Pattern="^[a-z0-9][.a-z0-9_-]*(/[a-z0-9][.a-z0-9_-]*)*$"
 	Name string `json:"name,omitempty"`
 
 	// Visibility defines whether the image is publicly visible.
@@ -94,6 +94,7 @@ type ImageStatus struct {
 	URL string `json:"url,omitempty"`
 
 	// Visibility shows actual generated image repository visibility.
+	// +kubebuilder:validation:Enum=public;private
 	Visibility ImageVisibility `json:"visibility,omitempty"`
 }
 

diff --git a/...pstudio.redhat.com_imagerepositories.yaml → ...pstudio.redhat.com_imagerepositories.yaml b/...pstudio.redhat.com_imagerepositories.yaml → ...pstudio.redhat.com_imagerepositories.yaml
@@ -5,9 +5,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
-  name: imagerepositories.appstudio.redhat.com.appstudio.redhat.com
+  name: imagerepositories.appstudio.redhat.com
 spec:
-  group: appstudio.redhat.com.appstudio.redhat.com
+  group: appstudio.redhat.com
   names:
     kind: ImageRepository
     listKind: ImageRepositoryList
@@ -58,7 +58,7 @@ spec:
                     description: Name of the image within configured Quay organization.
                       If ommited, then defaults to "cr-namespace/cr-name". This field
                       cannot be changed after the resource creation.
-                    pattern: '[a-z0-9][.a-z0-9_-]*(/[a-z0-9][.a-z0-9_-]*)*'
+                    pattern: ^[a-z0-9][.a-z0-9_-]*(/[a-z0-9][.a-z0-9_-]*)*$
                     type: string
                   visibility:
                     description: Visibility defines whether the image is publicly
@@ -113,11 +113,15 @@ spec:
                       / pull from.
                     type: string
                   visibility:
+                    allOf:
+                    - enum:
+                      - public
+                      - private
+                    - enum:
+                      - public
+                      - private
                     description: Visibility shows actual generated image repository
                       visibility.
-                    enum:
-                    - public
-                    - private
                     type: string
                 type: object
               message:

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -3,7 +3,7 @@
 # It should be run by config/default
 #resources:
 #- bases/appstudio.redhat.com_components.yaml
-- bases/appstudio.redhat.com.appstudio.redhat.com_imagerepositories.yaml
+- bases/appstudio.redhat.com_imagerepositories.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 #patchesStrategicMerge:

diff --git a/config/crd/patches/cainjection_in_imagerepositories.yaml b/config/crd/patches/cainjection_in_imagerepositories.yaml
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: imagerepositories.appstudio.redhat.com.appstudio.redhat.com
+  name: imagerepositories.appstudio.redhat.com
diff --git a/config/crd/patches/webhook_in_imagerepositories.yaml b/config/crd/patches/webhook_in_imagerepositories.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: imagerepositories.appstudio.redhat.com.appstudio.redhat.com
+  name: imagerepositories.appstudio.redhat.com
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/rbac/imagerepository_editor_role.yaml b/config/rbac/imagerepository_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: imagerepository-editor-role
 rules:
 - apiGroups:
-  - appstudio.redhat.com.appstudio.redhat.com
+  - appstudio.redhat.com
   resources:
   - imagerepositories
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - appstudio.redhat.com.appstudio.redhat.com
+  - appstudio.redhat.com
   resources:
   - imagerepositories/status
   verbs:

diff --git a/config/rbac/imagerepository_viewer_role.yaml b/config/rbac/imagerepository_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: imagerepository-viewer-role
 rules:
 - apiGroups:
-  - appstudio.redhat.com.appstudio.redhat.com
+  - appstudio.redhat.com
   resources:
   - imagerepositories
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - appstudio.redhat.com.appstudio.redhat.com
+  - appstudio.redhat.com
   resources:
   - imagerepositories/status
   verbs:

diff --git a/config/samples/appstudio.redhat.com_v1beta1_imagerepository.yaml b/config/samples/appstudio.redhat.com_v1beta1_imagerepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: appstudio.redhat.com.appstudio.redhat.com/v1beta1
+apiVersion: appstudio.redhat.com/v1beta1
 kind: ImageRepository
 metadata:
   name: imagerepository-sample

diff --git a/controllers/component_image_controller_test.go b/controllers/component_image_controller_test.go
@@ -54,7 +54,6 @@ var _ = Describe("Component image controller", func() {
 	Context("Image repository provision flow", func() {
 
 		It("should prepare environment", func() {
-			deleteNamespace(defaultNamespace)
 			createNamespace(defaultNamespace)
 
 			ResetTestQuayClient()