Updates Kube API for Ingress & CRDs

.ci/openshift_integration.sh

@@ -18,18 +18,17 @@ set -u
 # print each command before executing it
 set -x
 
-echo tests disabled
-# # Make sure we're running the integration tests with the image built by OpenShift CI
-# export IMG=${REGISTRY_OPERATOR}
+# Make sure we're running the integration tests with the image built by OpenShift CI
+export IMG=${REGISTRY_OPERATOR}
 
-# # For some reason go on PROW force usage vendor folder
-# # This workaround is here until we don't figure out cause
-# go mod tidy
-# go mod vendor
+# For some reason go on PROW force usage vendor folder
+# This workaround is here until we don't figure out cause
+go mod tidy
+go mod vendor
 
-# # Make sure kustomize and controller-gen are installed before running the tests
-# # ToDo: Remove later, should not be required.
-# make kustomize
-# make controller-gen
+# Make sure kustomize and controller-gen are installed before running the tests
+# ToDo: Remove later, should not be required.
+make kustomize
+make controller-gen
 
-# make test-integration
+make test-integration

.github/workflows/ci.yaml

@@ -21,7 +21,7 @@ jobs:
       name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.12
+        go-version: ^1.17
     -
       name: Check out code into the Go module directory
       uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:
         go mod tidy
         if [[ ! -z $(git status -s) ]]
         then
-          echo "Go mod state is not clean"
+          echo "Go mod state is not clean: $(git status -s)"
           exit 1
         fi
     -
@@ -55,10 +55,16 @@ jobs:
         git reset HEAD --hard
 
         make fmt
+        if [[ ! -z $(git status -s) ]]
+        then
+          echo "not well formatted sources found during make fmt: $(git status -s)"
+          exit 1
+        fi
+
         make fmt_license
         if [[ ! -z $(git status -s) ]]
         then
-          echo "not well formatted sources are found"
+          echo "not well formatted sources found during make fmt_license: $(git status -s)"
           exit 1
         fi
     -

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.13 as builder
+FROM golang:1.17 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -79,7 +79,7 @@ manifests: controller-gen
 ### fmt: Run go fmt against code
 fmt:
 ifneq ($(shell command -v goimports 2> /dev/null),)
-	find . -name '*.go' -exec goimports -w {} \;
+	find . -name '*.go' -not -name '*zz_generated*.go' -exec goimports -w {} \;
 else
 	@echo "WARN: goimports is not installed -- formatting using go fmt instead."
 	@echo "      Please install goimports to ensure file imports are consistent."
@@ -120,7 +120,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	GOFLAGS="" go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
+	GOFLAGS="" go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

README.md

@@ -72,7 +72,7 @@ The repository contains a Makefile; building and deploying can be configured via
 
 |variable|purpose|default value|
 |---|---|---|
-| `IMG` | Image used for controller | `quay.io/devfile/registry-operator:next` |
+| `IMG` | Image used for controller (run makefile, if `IMG` is updated) | `quay.io/devfile/registry-operator:next` |
 
 Some of the rules supported by the makefile:
 
@@ -85,6 +85,7 @@ Some of the rules supported by the makefile:
 | uninstall | remove the devfile registry operator and CRDs from the cluster |
 | manifests | Generate manifests e.g. CRD, RBAC etc. |
 | generate | Generate the API type definitions. Must be run after modifying the DevfileRegistry type. |
+| bundle | Generate bundle manifests and metadata, then validate generated files. |
 | test_integration | Run the integration tests for the operator. |
 
 To see all rules supported by the makefile, run `make help`

bundle.Dockerfile

@@ -6,8 +6,8 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=registry-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.12.0+git
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.4.0+git
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2
 
 # Labels for testing.

bundle/manifests/registry-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml

@@ -0,0 +1,10 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  creationTimestamp: null
+  name: registry-operator-metrics-reader
+rules:
+- nonResourceURLs:
+  - /metrics
+  verbs:
+  - get

bundle/manifests/registry-operator-metrics-reader_rbac.authorization.k8s.io_v1beta1_clusterrole.yaml

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null

bundle/manifests/registry.devfile.io_devfileregistries.yaml

@@ -1,16 +1,11 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: devfileregistries.registry.devfile.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .status.url
-    description: The URL for the Devfile Registry
-    name: URL
-    type: string
   group: registry.devfile.io
   names:
     kind: DevfileRegistry
@@ -21,72 +16,108 @@ spec:
     - dr
     singular: devfileregistry
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: DevfileRegistry is the Schema for the devfileregistries API
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: DevfileRegistrySpec defines the desired state of DevfileRegistry
-          properties:
-            devfileIndexImage:
-              description: Sets the container image containing devfile stacks to be deployed on the Devfile Registry
-              type: string
-            k8s:
-              description: DevfileRegistrySpecK8sOnly defines the desired state of the kubernetes-only fields of the DevfileRegistry
-              properties:
-                ingressDomain:
-                  description: Ingress domain for a Kubernetes cluster. This MUST be explicitly specified on Kubernetes. There are no defaults
-                  type: string
-              type: object
-            ociRegistryImage:
-              description: Overrides the container image used for the OCI registry. Recommended to leave blank and default to the image specified by the operator.
-              type: string
-            storage:
-              description: DevfileRegistrySpecStorage defines the desired state of the storage for the DevfileRegistry
-              properties:
-                enabled:
-                  description: Instructs the operator to deploy the DevfileRegistry with persistent storage Enabled by default. Disabling is only recommended for development or test.
-                  type: boolean
-                ociRegistryImage:
-                  description: Configures the size of the devfile registry's persistent volume, if enabled. Defaults to 1Gi.
-                  type: string
-              type: object
-            tls:
-              description: DevfileRegistrySpecTLS defines the desired state for TLS in the DevfileRegistry
-              properties:
-                enabled:
-                  description: Instructs the operator to deploy the DevfileRegistry with TLS enabled. Enabled by default. Disabling is only recommended for development or test.
-                  type: boolean
-                ociRegistryImage:
-                  description: Name of an optional, pre-existing TLS secret to use for TLS termination on ingress/route resources.
-                  type: string
-              type: object
-          type: object
-        status:
-          description: DevfileRegistryStatus defines the observed state of DevfileRegistry
-          properties:
-            url:
-              description: URL is the exposed URL for the Devfile Registry, and is set in the status after the registry has become available.
-              type: string
-          required:
-          - url
-          type: object
-      type: object
-  version: v1alpha1
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The URL for the Devfile Registry
+      jsonPath: .status.url
+      name: URL
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: DevfileRegistry is the Schema for the devfileregistries API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DevfileRegistrySpec defines the desired state of DevfileRegistry
+            properties:
+              devfileIndexImage:
+                description: Sets the container image containing devfile stacks to
+                  be deployed on the Devfile Registry
+                type: string
+              k8s:
+                description: DevfileRegistrySpecK8sOnly defines the desired state
+                  of the kubernetes-only fields of the DevfileRegistry
+                properties:
+                  ingressDomain:
+                    description: Ingress domain for a Kubernetes cluster. This MUST
+                      be explicitly specified on Kubernetes. There are no defaults
+                    type: string
+                type: object
+              ociRegistryImage:
+                description: Overrides the container image used for the OCI registry.
+                  Recommended to leave blank and default to the image specified by
+                  the operator.
+                type: string
+              storage:
+                description: DevfileRegistrySpecStorage defines the desired state
+                  of the storage for the DevfileRegistry
+                properties:
+                  enabled:
+                    description: Instructs the operator to deploy the DevfileRegistry
+                      with persistent storage Enabled by default. Disabling is only
+                      recommended for development or test.
+                    type: boolean
+                  ociRegistryImage:
+                    description: Configures the size of the devfile registry's persistent
+                      volume, if enabled. Defaults to 1Gi.
+                    type: string
+                type: object
+              telemetry:
+                description: Telemetry defines the desired state for telemetry in
+                  the DevfileRegistry
+                properties:
+                  enabled:
+                    description: Instructs the operator to deploy the DevfileRegistry
+                      with telemetry enabled. Disabled by default. Enabling is recommended
+                      for registry improvement.
+                    type: boolean
+                  registryName:
+                    description: The registry name (can be any string) that is used
+                      as identifier for devfile telemetry.
+                    type: string
+                type: object
+              tls:
+                description: DevfileRegistrySpecTLS defines the desired state for
+                  TLS in the DevfileRegistry
+                properties:
+                  enabled:
+                    description: Instructs the operator to deploy the DevfileRegistry
+                      with TLS enabled. Enabled by default. Disabling is only recommended
+                      for development or test.
+                    type: boolean
+                  ociRegistryImage:
+                    description: Name of an optional, pre-existing TLS secret to use
+                      for TLS termination on ingress/route resources.
+                    type: string
+                type: object
+            type: object
+          status:
+            description: DevfileRegistryStatus defines the observed state of DevfileRegistry
+            properties:
+              url:
+                description: URL is the exposed URL for the Devfile Registry, and
+                  is set in the status after the registry has become available.
+                type: string
+            required:
+            - url
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""

bundle/metadata/annotations.yaml

@@ -5,8 +5,8 @@ annotations:
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: registry-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.12.0+git
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.4.0+git
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2
 
   # Annotations for testing.