chore: uplift to 2.16 and fix lint

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
opendatahub-io · Oct 28, 2024 · 70803e2 · 70803e2
1 parent a83b59e
commit 70803e2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 36 deletions.
diff --git 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.15.0
+VERSION ?= 2.16.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/rhods-operator.clusterserviceversion.yaml b/bundle/manifests/rhods-operator.clusterserviceversion.yaml
@@ -103,7 +103,7 @@ metadata:
     categories: AI/Machine Learning, Big Data
     certified: "False"
     containerImage: REPLACE_IMAGE:latest
-    createdAt: "2024-10-18T15:43:19Z"
+    createdAt: "2024-10-28T09:05:34Z"
     description: Operator for deployment and management of Red Hat OpenShift AI
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "false"
@@ -181,7 +181,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/red-hat-data-services/rhods-operator
     support: Red Hat OpenShift AI
-  name: rhods-operator.v2.15.0
+  name: rhods-operator.v2.16.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -580,12 +580,6 @@ spec:
           - patch
           - update
           - watch
-        - apiGroups:
-          - custom.tekton.dev
-          resources:
-          - pipelineloops
-          verbs:
-          - '*'
         - apiGroups:
           - dashboard.opendatahub.io
           resources:
@@ -1113,12 +1107,6 @@ spec:
           - delete
           - get
           - patch
-        - apiGroups:
-          - tekton.dev
-          resources:
-          - '*'
-          verbs:
-          - '*'
         - apiGroups:
           - template.openshift.io
           resources:
@@ -1180,7 +1168,7 @@ spec:
                       fieldPath: metadata.namespace
                 - name: DEFAULT_MANIFESTS_PATH
                   value: /opt/manifests
-                image: quay.io/wenzhou/rhods-operator:2.15.0
+                image: quay.io/wenzhou/rhods-operator:2.16.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -1262,15 +1250,15 @@ spec:
   - Data Science
   links:
   - name: Red Hat OpenShift AI
-    url: https://docs.redhat.com/en/documentation/red_hat_openshift_ai_self-managed/2.15.0
+    url: https://docs.redhat.com/en/documentation/red_hat_openshift_ai_self-managed/2.16.0
   maintainers:
   - email: managed-open-data-hub@redhat.com
     name: Red Hat Openshift AI
   maturity: stable
   minKubeVersion: 1.25.0
   provider:
     name: Red Hat
-  version: 2.15.0
+  version: 2.16.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/wenzhou/rhods-operator
-  newTag: 2.15.0
+  newTag: 2.16.0
 
 resources:
 - manager.yaml

diff --git a/config/manifests/bases/rhods-operator.clusterserviceversion.yaml b/config/manifests/bases/rhods-operator.clusterserviceversion.yaml
@@ -179,12 +179,12 @@ spec:
   - Data Science
   links:
   - name: Red Hat OpenShift AI
-    url: https://docs.redhat.com/en/documentation/red_hat_openshift_ai_self-managed/2.15.0
+    url: https://docs.redhat.com/en/documentation/red_hat_openshift_ai_self-managed/2.16.0
   maintainers:
   - email: managed-open-data-hub@redhat.com
     name: Red Hat Openshift AI
   maturity: stable
   minKubeVersion: 1.25.0
   provider:
     name: Red Hat
-  version: 2.15.0
+  version: 2.16.0
diff --git a/controllers/secretgenerator/secretgenerator_controller_test.go b/controllers/secretgenerator/secretgenerator_controller_test.go
@@ -23,7 +23,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-
+//nolint:ireturn
 func newFakeClient(objs ...client.Object) client.Client {
 	scheme := runtime.NewScheme()
 	utilruntime.Must(corev1.AddToScheme(scheme))

diff --git a/get_all_manifests.sh b/get_all_manifests.sh
@@ -6,20 +6,20 @@ 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:ref-name:source-folder:target-folder".
 declare -A COMPONENT_MANIFESTS=(
-    ["codeflare"]="red-hat-data-services:codeflare-operator:rhoai-2.15:config:codeflare"
-    ["ray"]="red-hat-data-services:kuberay:rhoai-2.15:ray-operator/config:ray"
-    ["kueue"]="red-hat-data-services:kueue:rhoai-2.15:config:kueue"
-    ["data-science-pipelines-operator"]="red-hat-data-services:data-science-pipelines-operator:rhoai-2.15:config:data-science-pipelines-operator"
-    ["odh-dashboard"]="red-hat-data-services:odh-dashboard:rhoai-2.15:manifests:dashboard"
-    ["kf-notebook-controller"]="red-hat-data-services:kubeflow:rhoai-2.15:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller"
-    ["odh-notebook-controller"]="red-hat-data-services:kubeflow:rhoai-2.15:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller"
-    ["notebooks"]="red-hat-data-services:notebooks:rhoai-2.15:manifests:notebooks"
-    ["trustyai"]="red-hat-data-services:trustyai-service-operator:rhoai-2.15:config:trustyai-service-operator"
-    ["model-mesh"]="red-hat-data-services:modelmesh-serving:rhoai-2.15:config:model-mesh"
-    ["odh-model-controller"]="red-hat-data-services:odh-model-controller:rhoai-2.15:config:odh-model-controller"
-    ["kserve"]="red-hat-data-services:kserve:rhoai-2.15:config:kserve"
-    ["modelregistry"]="red-hat-data-services:model-registry-operator:rhoai-2.15:config:model-registry-operator"
-    ["trainingoperator"]="red-hat-data-services:training-operator:rhoai-2.15:manifests:trainingoperator"
+    ["codeflare"]="red-hat-data-services:codeflare-operator:rhoai-2.16:config:codeflare"
+    ["ray"]="red-hat-data-services:kuberay:rhoai-2.16:ray-operator/config:ray"
+    ["kueue"]="red-hat-data-services:kueue:rhoai-2.16:config:kueue"
+    ["data-science-pipelines-operator"]="red-hat-data-services:data-science-pipelines-operator:rhoai-2.16:config:data-science-pipelines-operator"
+    ["odh-dashboard"]="red-hat-data-services:odh-dashboard:rhoai-2.16:manifests:dashboard"
+    ["kf-notebook-controller"]="red-hat-data-services:kubeflow:rhoai-2.16:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller"
+    ["odh-notebook-controller"]="red-hat-data-services:kubeflow:rhoai-2.16:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller"
+    ["notebooks"]="red-hat-data-services:notebooks:rhoai-2.16:manifests:notebooks"
+    ["trustyai"]="red-hat-data-services:trustyai-service-operator:rhoai-2.16:config:trustyai-service-operator"
+    ["model-mesh"]="red-hat-data-services:modelmesh-serving:rhoai-2.16:config:model-mesh"
+    ["odh-model-controller"]="red-hat-data-services:odh-model-controller:rhoai-2.16:config:odh-model-controller"
+    ["kserve"]="red-hat-data-services:kserve:rhoai-2.16:config:kserve"
+    ["modelregistry"]="red-hat-data-services:model-registry-operator:rhoai-2.16:config:model-registry-operator"
+    ["trainingoperator"]="red-hat-data-services:training-operator:rhoai-2.16:manifests:trainingoperator"
 )
 
 # Allow overwriting repo using flags component=repo