diff --git a/Dockerfiles/bundle.Dockerfile b/Dockerfiles/bundle.Dockerfile index 133f0557f2c..943fb34ad4a 100644 --- a/Dockerfiles/bundle.Dockerfile +++ b/Dockerfiles/bundle.Dockerfile @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=opendatahub-operator LABEL operators.operatorframework.io.bundle.channels.v1=fast LABEL operators.operatorframework.io.bundle.channel.default.v1=fast -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.24.1 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/Makefile b/Makefile index 30114d3137b..478f30a14c5 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - 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) -VERSION ?= 2.10.1 +VERSION ?= 2.12.0 # 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/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml index 95c38f35913..c181e588af5 100644 --- a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml @@ -101,14 +101,14 @@ metadata: capabilities: Full Lifecycle categories: AI/Machine Learning, Big Data certified: "False" - containerImage: quay.io/opendatahub/opendatahub-operator:v2.10.0 - createdAt: "2024-4-22T00:00:00Z" - olm.skipRange: '>=1.0.0 <2.11.0' - operators.operatorframework.io/builder: operator-sdk-v1.24.1 + containerImage: quay.io/opendatahub/opendatahub-operator:v2.12.0 + createdAt: "2024-04-30T17:02:53Z" + olm.skipRange: '>=1.0.0 <2.12.0' + operators.operatorframework.io/builder: operator-sdk-v1.31.0 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.v2.10.1 + name: opendatahub-operator.v2.12.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -1675,7 +1675,6 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=0.0.0.0:8080 - --leader-elect - - --operator-name=opendatahub command: - /manager env: @@ -1764,7 +1763,7 @@ spec: selector: matchLabels: component: opendatahub-operator - version: 2.10.1 + version: 2.12.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index ec98f7c4f55..54527a9eca3 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -6,7 +6,7 @@ annotations: operators.operatorframework.io.bundle.package.v1: opendatahub-operator operators.operatorframework.io.bundle.channels.v1: fast operators.operatorframework.io.bundle.channel.default.v1: fast - operators.operatorframework.io.metrics.builder: operator-sdk-v1.24.1 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml deleted file mode 100644 index 45d2455b258..00000000000 --- a/config/manager/kustomization.yaml +++ /dev/null @@ -1,16 +0,0 @@ -resources: -- manager.yaml - -generatorOptions: - disableNameSuffixHash: true - -configMapGenerator: -- files: - - controller_manager_config.yaml - name: manager-config -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -images: -- name: controller - newName: quay.io/opendatahub/opendatahub-operator - newTag: latest diff --git a/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml b/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml index 38dca744768..fc135c0a050 100644 --- a/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml @@ -6,12 +6,12 @@ metadata: capabilities: Full Lifecycle categories: AI/Machine Learning, Big Data certified: "False" - containerImage: quay.io/opendatahub/opendatahub-operator:v2.10.0 - createdAt: "2024-4-22T00:00:00Z" - olm.skipRange: '>=1.0.0 <2.11.0' + containerImage: quay.io/opendatahub/opendatahub-operator:v2.12.0 + createdAt: "2024-4-30T00:00:00Z" + olm.skipRange: '>=1.0.0 <2.12.0' operators.operatorframework.io/internal-objects: '[dscinitialization.opendatahub.io]' repository: https://github.com/opendatahub-io/opendatahub-operator - name: opendatahub-operator.v2.11.0 + name: opendatahub-operator.v2.12.0 namespace: placeholder spec: apiservicedefinitions: {} diff --git a/get_all_manifests.sh b/get_all_manifests.sh index 9a3488570a0..a55a2b52204 100755 --- a/get_all_manifests.sh +++ b/get_all_manifests.sh @@ -6,19 +6,19 @@ GITHUB_URL="https://github.com/" # component: notebook, dsp, kserve, dashbaord, cf/ray/kueue/trainingoperator, trustyai, modelmesh, modelregistry. # in the format of "repo-org:repo-name:branch-name:source-folder:target-folder". declare -A COMPONENT_MANIFESTS=( - ["codeflare"]="opendatahub-io:codeflare-operator:main:config:codeflare" - ["ray"]="opendatahub-io:kuberay:dev:ray-operator/config:ray" - ["kueue"]="opendatahub-io:kueue:dev:config:kueue" - ["data-science-pipelines-operator"]="opendatahub-io:data-science-pipelines-operator:main:config:data-science-pipelines-operator" - ["odh-dashboard"]="opendatahub-io:odh-dashboard:incubation:manifests:dashboard" - ["kf-notebook-controller"]="opendatahub-io:kubeflow:v1.7-branch:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller" - ["odh-notebook-controller"]="opendatahub-io:kubeflow:v1.7-branch:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller" - ["notebooks"]="opendatahub-io:notebooks:main:manifests:notebooks" - ["trustyai"]="trustyai-explainability:trustyai-service-operator:main:config:trustyai-service-operator" - ["model-mesh"]="opendatahub-io:modelmesh-serving:release-0.11.1:config:model-mesh" - ["odh-model-controller"]="opendatahub-io:odh-model-controller:release-0.12.0:config:odh-model-controller" - ["kserve"]="opendatahub-io:kserve:release-v0.11.1:config:kserve" - ["modelregistry"]="opendatahub-io:model-registry-operator:main:config:model-registry-operator" + ["codeflare"]="opendatahub-io:codeflare-operator:v1.2.0:config:codeflare" + ["ray"]="opendatahub-io:kuberay:v1.0.0-rhoai:ray-operator/config:ray" + ["kueue"]="opendatahub-io:kueue:v0.6.0-rhoai-2.9:config:kueue" + ["data-science-pipelines-operator"]="opendatahub-io:data-science-pipelines-operator:v2.0.1:config:data-science-pipelines-operator" + ["odh-dashboard"]="opendatahub-io:odh-dashboard:v2.21.1-incubation-release:manifests:dashboard" + ["kf-notebook-controller"]="opendatahub-io:kubeflow:v1.7.0-7:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller" + ["odh-notebook-controller"]="opendatahub-io:kubeflow:v1.7.0-7:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller" + ["notebooks"]="opendatahub-io:notebooks:v1.15.0:manifests:notebooks" + ["trustyai"]="trustyai-explainability:trustyai-service-operator:release/1.17.0:config:trustyai-service-operator" + ["model-mesh"]="opendatahub-io:modelmesh-serving:v1.2.00:config:model-mesh" + ["odh-model-controller"]="opendatahub-io:odh-model-controller:v1.2.01:config:odh-model-controller" + ["kserve"]="opendatahub-io:kserve:v1.2.02:config:kserve" + ["modelregistry"]="opendatahub-io:model-registry-operator:v1.2.03:config:model-registry-operator" ["trainingoperator"]="opendatahub-io:training-operator:dev:manifests:trainingoperator" )