From 7e904df680f9ae3bfe121999cfb00fb2f9ee5a6c Mon Sep 17 00:00:00 2001 From: Vaishnavi Hire Date: Mon, 10 Jul 2023 12:10:38 -0700 Subject: [PATCH] Update Operator Dev preview to v0.0.2 (#291) --- Makefile | 2 +- .../v1alpha1/dscinitialization_types.go | 2 +- ...er.opendatahub.io_datascienceclusters.yaml | 2 +- ...ion.opendatahub.io_dscinitializations.yaml | 2 +- ...atahub-operator.clusterserviceversion.yaml | 6 +-- ...er.opendatahub.io_datascienceclusters.yaml | 3 +- ...ion.opendatahub.io_dscinitializations.yaml | 3 +- config/manager/kustomization.yaml | 2 +- config/rbac/role.yaml | 1 + controllers/dscinitialization/monitoring.go | 2 +- docs/Dev-Preview.md | 51 ++++++++++--------- 11 files changed, 42 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 36bfa6eeffd..ed956b573ea 100644 --- a/Makefile +++ b/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. # diff --git a/apis/dscinitialization/v1alpha1/dscinitialization_types.go b/apis/dscinitialization/v1alpha1/dscinitialization_types.go index 9e2355311fd..6206c3dad5f 100644 --- a/apis/dscinitialization/v1alpha1/dscinitialization_types.go +++ b/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"` } diff --git a/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml index 34e67716f6a..0b95189b693 100644 --- a/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml +++ b/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: diff --git a/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml b/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml index 6258dc4c6b6..e0cd8c88587 100644 --- a/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml +++ b/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: diff --git a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml index 3bf8d1c1d3b..a2184e3fb5d 100644 --- a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml +++ b/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 diff --git a/config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml index 5670054dfa2..3e6db26119f 100644 --- a/config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml +++ b/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 diff --git a/config/crd/bases/dscinitialization.opendatahub.io_dscinitializations.yaml b/config/crd/bases/dscinitialization.opendatahub.io_dscinitializations.yaml index a26423d78a0..1f4ba540429 100644 --- a/config/crd/bases/dscinitialization.opendatahub.io_dscinitializations.yaml +++ b/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 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 1f162507228..f2e8b763f91 100644 --- a/config/manager/kustomization.yaml +++ b/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 diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 22566afa427..06e6bf7c480 100644 --- a/config/rbac/role.yaml +++ b/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: diff --git a/controllers/dscinitialization/monitoring.go b/controllers/dscinitialization/monitoring.go index 21cf4b8c108..464e29552c2 100644 --- a/controllers/dscinitialization/monitoring.go +++ b/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", diff --git a/docs/Dev-Preview.md b/docs/Dev-Preview.md index 3a6e2c0c8cb..7a4de96e89a 100644 --- a/docs/Dev-Preview.md +++ b/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 <