Set images to 1.33 and remove tech-preview string (#44) (#45)

* set images version to 1.33 * remove tech-preview string from images
kiegroup · May 15, 2024 · 2ad6aab · 2ad6aab
1 parent d46473b
commit 2ad6aab
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/Makefile.prod b/Makefile.prod
@@ -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 ?= 1.32.0
+VERSION ?= 1.33.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -29,7 +29,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
 # kiegroup.org/kogito-serverless-operator-bundle:$VERSION and kiegroup.org/kogito-serverless-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= registry.redhat.io/openshift-serverless-1-tech-preview/logic-rhel8-operator
+IMAGE_TAG_BASE ?= registry.redhat.io/openshift-serverless-1/logic-rhel8-operator
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)

diff --git a/bundle.prod/manifests/logic-operator-rhel8-builder-config_v1_configmap.yaml b/bundle.prod/manifests/logic-operator-rhel8-builder-config_v1_configmap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 data:
   DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
   DEFAULT_WORKFLOW_EXTENSION: .sw.json
-  Dockerfile: "FROM registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:latest
+  Dockerfile: "FROM registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:latest
     AS builder\n\n# variables that can be overridden by the builder\n# To add a Quarkus
     extension to your application\nARG QUARKUS_EXTENSIONS\n# Args to pass to the Quarkus
     CLI add extension command\nARG QUARKUS_ADD_EXTENSION_ARGS\n# Additional java/mvn arguments to pass to the builder\n

diff --git a/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml b/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml
@@ -113,7 +113,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/apache/incubator-kie-kogito-serverless-operator
     support: Red Hat
-  name: logic-operator-rhel8.v1.32.0
+  name: logic-operator-rhel8.v1.33.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -560,7 +560,7 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.namespace
-                    image: registry.redhat.io/openshift-serverless-1-tech-preview/logic-rhel8-operator@sha256:cdc81719192f2dfdf8a1d366cda54347462acba3425f48a61b29631f191284fa
+                    image: registry.redhat.io/openshift-serverless-1/logic-rhel8-operator@sha256:cdc81719192f2dfdf8a1d366cda54347462acba3425f48a61b29631f191284fa
                     livenessProbe:
                       httpGet:
                         path: /healthz
@@ -652,6 +652,6 @@ spec:
   relatedImages:
     - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:4564ca3dc5bac80d6faddaf94c817fbbc270698a9399d8a21ee1005d85ceda56
       name: kube-rbac-proxy
-    - image: registry.redhat.io/openshift-serverless-1-tech-preview/logic-rhel8-operator@sha256:cdc81719192f2dfdf8a1d366cda54347462acba3425f48a61b29631f191284fa
+    - image: registry.redhat.io/openshift-serverless-1/logic-rhel8-operator@sha256:cdc81719192f2dfdf8a1d366cda54347462acba3425f48a61b29631f191284fa
       name: manager
-  version: 1.32.0
+  version: 1.33.0
diff --git a/config/manager/prod/kustomization.yaml b/config/manager/prod/kustomization.yaml
@@ -20,7 +20,7 @@ kind: Kustomization
 images:
 - digest: sha256:cdc81719192f2dfdf8a1d366cda54347462acba3425f48a61b29631f191284fa
   name: controller
-  newName: registry.redhat.io/openshift-serverless-1-tech-preview/logic-rhel8-operator
+  newName: registry.redhat.io/openshift-serverless-1/logic-rhel8-operator
 # Patching the manager deployment file to add an env var with the operator namespace in
 patchesJson6902:
 - patch: |-

diff --git a/config/manager/prod/sonataflow_builder_dockerfile.yaml b/config/manager/prod/sonataflow_builder_dockerfile.yaml
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:latest AS builder
+FROM registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:latest AS builder
 
 # variables that can be overridden by the builder
 # To add a Quarkus extension to your application

diff --git a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml
@@ -200,11 +200,11 @@ spec:
   provider:
     name: Red Hat
   relatedImages:
-  - image: registry.redhat.io/openshift-serverless-1-tech-preview/logic-operator-rhel8:1.32.0
+  - image: registry.redhat.io/openshift-serverless-1/logic-operator-rhel8:1.33.0
     name: IMAGE_LOGIC_SWF_OPERATOR
-  - image: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8:1.32.0
+  - image: registry.redhat.io/openshift-serverless-1/logic-swf-devmode-rhel8:1.33.0
     name: IMAGE_LOGIC_SWF_DEVMODE
-  - image: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:1.32.0
+  - image: registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8:1.33.0
     name: IMAGE_LOGIC_SWF_BUILDER
   - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:4564ca3dc5bac80d6faddaf94c817fbbc270698a9399d8a21ee1005d85ceda56
     name: IMAGE_KUBE_RBAC_PROXY

diff --git a/controllers/platform/platformutils_test.go b/controllers/platform/platformutils_test.go
@@ -43,9 +43,9 @@ func TestSonataFlowBuildController(t *testing.T) {
 	assert.True(t, foundDefault)
 
 	// 2 - Let's try to override using the productized image
-	platform.Spec.Build.Config.BaseImage = "registry.access.redhat.com/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8"
+	platform.Spec.Build.Config.BaseImage = "registry.access.redhat.com/openshift-serverless-1/logic-swf-builder-rhel8"
 	resProductized := GetCustomizedBuilderDockerfile(dockerfile, *platform)
-	foundProductized, err := regexp.MatchString("FROM registry.access.redhat.com/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8 AS builder", resProductized)
+	foundProductized, err := regexp.MatchString("FROM registry.access.redhat.com/openshift-serverless-1/logic-swf-builder-rhel8 AS builder", resProductized)
 	assert.NoError(t, err)
 	assert.True(t, foundProductized)
 }
diff --git a/images/modules/com.redhat.osl.builder/module.yaml b/images/modules/com.redhat.osl.builder/module.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 name: com.redhat.osl.builder
-version: "1.32.0"
+version: "1.33.0"
 description: Builds the operator binary
 
 envs:

diff --git a/images/modules/com.redhat.osl.bundleinstall/module.yaml b/images/modules/com.redhat.osl.bundleinstall/module.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 name: com.redhat.osl.bundleinstall
-version: "1.32.0"
+version: "1.33.0"
 description: Copy the bund files to the target image
 
 artifacts:

diff --git a/images/prod-bundle-image.yaml b/images/prod-bundle-image.yaml
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 schema_version: 1
-name: "openshift-serverless-1-tech-preview/logic-operator-bundle"
+name: "openshift-serverless-1/logic-operator-bundle"
 description: "OpenShift Serverless Logic Operator Bundle"
-version: "1.32.0"
+version: "1.33.0"
 from: "scratch"
 
 labels:
@@ -81,4 +81,4 @@ osbs:
   extra_dir: osbs-extra
   repository:
     name: containers/openshift-serverless-1-logic-operator-bundle
-    branch: openshift-serverless-1.32-rhel-8
+    branch: openshift-serverless-1.33-rhel-8
diff --git a/images/prod-operator-image.yaml b/images/prod-operator-image.yaml
@@ -14,7 +14,7 @@
 
 - schema_version: 1
   name: "operator-builder"
-  version: "1.32.0"
+  version: "1.33.0"
   from: "registry.access.redhat.com/ubi8/go-toolset:1.20.12"
   description: "Golang builder image for the Red Hat OpenShift Serverless Logic Operator"
 
@@ -39,8 +39,8 @@
             - ppc64le
             - aarch64
 
-- name: "openshift-serverless-1-tech-preview/logic-rhel8-operator"
-  version: "1.32.0"
+- name: "openshift-serverless-1/logic-rhel8-operator"
+  version: "1.33.0"
   from: "registry.access.redhat.com/ubi8/ubi-micro:latest"
   description: "Runtime Image for the Red Hat OpenShift Serverless Logic Operator"
 
@@ -69,7 +69,7 @@
     extra_dir: osbs-extra
     repository:
       name: containers/openshift-serverless-1-logic-operator
-      branch: openshift-serverless-1.32-rhel-8
+      branch: openshift-serverless-1.33-rhel-8
 
   run:
     user: "1001"