Update Operator Dev preview to v0.0.2 (#291)

Makefile

@@ -4,7 +4,7 @@
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 IMAGE_OWNER ?= opendatahub
-VERSION ?= 0.0.1
+VERSION ?= 0.0.2
 # IMAGE_TAG_BASE defines the opendatahub.io namespace and part of the image name for remote images.
 # This variable is used to construct full image tags for bundle and catalog images.
 #

apis/dscinitialization/v1alpha1/dscinitialization_types.go

@@ -41,7 +41,7 @@ type DSCInitializationSpec struct {
 
 type Monitoring struct {
 	// +kubebuilder:default=false
-	Enabled   bool   `json:"enabled,omitempty"`
+	Enabled bool `json:"enabled,omitempty"`
 	// +kubebuilder:default=opendatahub
 	Namespace string `json:"namespace,omitempty"`
 }

bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: datascienceclusters.datasciencecluster.opendatahub.io
 spec:

bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: dscinitializations.dscinitialization.opendatahub.io
 spec:

bundle/manifests/opendatahub-operator.clusterserviceversion.yaml

@@ -167,7 +167,7 @@ metadata:
     operators.operatorframework.io/internal-objects: '[dscinitialization.opendatahub.io]'
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/opendatahub-io/opendatahub-operator
-  name: opendatahub-operator.v0.0.1
+  name: opendatahub-operator.v0.0.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -390,7 +390,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: quay.io/opendatahub/opendatahub-operator:dev-0.0.1
+                image: quay.io/opendatahub/opendatahub-operator:dev-0.0.2
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -478,4 +478,4 @@ spec:
   maturity: alpha
   provider:
     name: ODH
-  version: 0.0.1
+  version: 0.0.2

config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml

@@ -3,7 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.9.2
+  creationTimestamp: null
   name: datascienceclusters.datasciencecluster.opendatahub.io
 spec:
   group: datasciencecluster.opendatahub.io

config/crd/bases/dscinitialization.opendatahub.io_dscinitializations.yaml

@@ -3,7 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.9.2
+  creationTimestamp: null
   name: dscinitializations.dscinitialization.opendatahub.io
 spec:
   group: dscinitialization.opendatahub.io

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/opendatahub/opendatahub-operator
-  newTag: dev-0.0.1
+  newTag: dev-0.0.2

config/rbac/role.yaml

@@ -2,6 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  creationTimestamp: null
   name: controller-manager-role
 rules:
 - apiGroups:

controllers/dscinitialization/monitoring.go

@@ -169,7 +169,7 @@ func configureBlackboxExporter(dsciInit *dsci.DSCInitialization, cli client.Clie
 			return err
 		}
 	}
-	
+
 	if apierrs.IsNotFound(err) || strings.Contains(consoleRoute.Spec.Host, "redhat.com") {
 		err := deploy.DeployManifestsFromPath(dsciInit, cli,
 			deploy.DefaultManifestPath+"/monitoring/blackbox-exporter/internal",

docs/Dev-Preview.md

@@ -15,35 +15,40 @@ released in phases and will be made available before release in the form of a `c
 
    ```console
    $ cat <<EOF | oc create -f -
-    apiVersion: operators.coreos.com/v1alpha1
-    kind: CatalogSource
-    metadata:
-    name: opendatahub-dev-catalog
-    namespace: openshift-marketplace
-    spec:
-    sourceType: grpc
-    image: quay.io/opendatahub/opendatahub-operator-catalog:$RELEASE_TAG
-    displayName: Open Data Hub Operator (Preview)
-    publisher: ODH
-    EOF
+   apiVersion: operators.coreos.com/v1alpha1
+   kind: CatalogSource
+   metadata:
+     name: opendatahub-dev-catalog
+     namespace: openshift-marketplace
+   spec:
+     sourceType: grpc
+     image: quay.io/opendatahub/opendatahub-operator-catalog:$RELEASE_TAG
+     displayName: Open Data Hub Operator (Preview)
+     publisher: ODH
+   EOF
 
    ```
 3. Subscribe to the ODH custom catalog
    ```console
    $ cat <<EOF | oc create -f -
-    apiVersion: operators.coreos.com/v1alpha1
-    kind: Subscription
-    metadata:
-    name: opendatahub-operator
-    namespace: openshift-operators
-    spec:
-    channel: fast
-    name: opendatahub-operator
-    source: opendatahub-dev-catalog
-    sourceNamespace: openshift-marketplace
-    EOF
+   apiVersion: operators.coreos.com/v1alpha1
+   kind: Subscription
+   metadata:
+     name: opendatahub-operator
+     namespace: openshift-operators
+   spec:
+     channel: fast
+     name: opendatahub-operator
+     source: opendatahub-dev-catalog
+     sourceNamespace: openshift-marketplace
+   EOF
    ```
-
+4. Delete CatalogSource and Subscription after use.
+   ```console
+   oc delete subscription/opendatahub-dev-catalog -n openshift-operators
+   oc delete catalogsource/opendatahub-dev-catalog -n openshift-marketplace
+   ```
+
 ## Usage
 
 1. When Operator is installed it creates a namespace called `opendatahub`.