OSSM-3551 Add metadata stub for 3.0

maistra · Mar 17, 2023 · 09aab65 · 09aab65
1 parent ecd25d5
commit 09aab65
Show file tree

Hide file tree

Showing 16 changed files with 22,257 additions and 36 deletions.
diff --git a/Makefile b/Makefile
@@ -18,11 +18,11 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
 
 -include Makefile.overrides
 
-MAISTRA_VERSION        ?= 2.4.0
-MAISTRA_BRANCH         ?= maistra-2.4
-ISTIO_VERSION          ?= 1.16.1
-REPLACES_PRODUCT_CSV   ?= 2.3.0
-REPLACES_COMMUNITY_CSV ?= 2.3.0
+MAISTRA_VERSION        ?= 3.0.0
+MAISTRA_BRANCH         ?= maistra-next
+ISTIO_VERSION          ?= 1.18.0
+REPLACES_PRODUCT_CSV   ?= 2.4.0
+REPLACES_COMMUNITY_CSV ?= 2.4.0
 VERSION                ?= development
 CONTAINER_CLI          ?= docker
 COMMUNITY              ?= true

diff --git a/build/manifest-templates/package.yaml b/build/manifest-templates/package.yaml
@@ -1,5 +1,5 @@
 packageName: __NAME__
 channels:
-- name: "2.0"
+- name: "3.0"
   currentCSV: __NAME__.v__VERSION__
-defaultChannel: "2.0"
+defaultChannel: "3.0"
diff --git a/deploy/maistra-operator.yaml b/deploy/maistra-operator.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.0
+    maistra-version: 3.0.0
   annotations:
     service.beta.openshift.io/inject-cabundle: "true"
     controller-gen.kubebuilder.io/version: v0.4.1
@@ -10114,7 +10114,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.0
+    maistra-version: 3.0.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
@@ -10268,7 +10268,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.0
+    maistra-version: 3.0.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null

diff --git a/deploy/servicemesh-operator.yaml b/deploy/servicemesh-operator.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.0
+    maistra-version: 3.0.0
   annotations:
     service.beta.openshift.io/inject-cabundle: "true"
     controller-gen.kubebuilder.io/version: v0.4.1
@@ -10114,7 +10114,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.0
+    maistra-version: 3.0.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
@@ -10268,7 +10268,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.0
+    maistra-version: 3.0.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
@@ -10738,13 +10738,17 @@ spec:
         olm.relatedImage.v2_3.wasm-cacher: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-pilot-rhel8:${OSSM_23}
         olm.relatedImage.v2_3.rls: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-ratelimit-rhel8:${OSSM_23}
         # 2.4 images
-        olm.relatedImage.v2_4.cni: ${OSSM_CNI_IMAGE}
-        olm.relatedImage.v2_4.grafana: ${OSSM_GRAFANA_IMAGE}
-        olm.relatedImage.v2_4.pilot: ${OSSM_PILOT_IMAGE}
-        olm.relatedImage.v2_4.prometheus: ${OSSM_PROMETHEUS_IMAGE}
-        olm.relatedImage.v2_4.proxyv2: ${OSSM_PROXY_IMAGE}
-        olm.relatedImage.v2_4.rls: ${OSSM_RATELIMIT_IMAGE}
-
+        olm.relatedImage.v2_4.cni: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-istio-cni-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.grafana: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-grafana-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.pilot: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-pilot-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.prometheus: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-prometheus-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.proxyv2: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-proxyv2-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.rls: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-ratelimit-rhel8:${OSSM_24}
+        # 3.0 images
+        olm.relatedImage.v3_0.cni: ${OSSM_CNI_IMAGE}
+        olm.relatedImage.v3_0.pilot: ${OSSM_PILOT_IMAGE}
+        olm.relatedImage.v3_0.proxyv2: ${OSSM_PROXY_IMAGE}
+        olm.relatedImage.v3_0.rls: ${OSSM_RATELIMIT_IMAGE}
         oauth-proxy.query: "true"
         oauth-proxy.namespace: openshift
         oauth-proxy.name: oauth-proxy

diff --git a/deploy/src/crd.yaml b/deploy/src/crd.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.0
+    maistra-version: 3.0.0
   annotations:
     service.beta.openshift.io/inject-cabundle: "true"
     controller-gen.kubebuilder.io/version: v0.4.1
@@ -10113,7 +10113,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.0
+    maistra-version: 3.0.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
@@ -10267,7 +10267,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    maistra-version: 2.4.0
+    maistra-version: 3.0.0
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null

diff --git a/deploy/src/deployment-servicemesh.yaml b/deploy/src/deployment-servicemesh.yaml
@@ -48,13 +48,17 @@ spec:
         olm.relatedImage.v2_3.wasm-cacher: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-pilot-rhel8:${OSSM_23}
         olm.relatedImage.v2_3.rls: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-ratelimit-rhel8:${OSSM_23}
         # 2.4 images
-        olm.relatedImage.v2_4.cni: ${OSSM_CNI_IMAGE}
-        olm.relatedImage.v2_4.grafana: ${OSSM_GRAFANA_IMAGE}
-        olm.relatedImage.v2_4.pilot: ${OSSM_PILOT_IMAGE}
-        olm.relatedImage.v2_4.prometheus: ${OSSM_PROMETHEUS_IMAGE}
-        olm.relatedImage.v2_4.proxyv2: ${OSSM_PROXY_IMAGE}
-        olm.relatedImage.v2_4.rls: ${OSSM_RATELIMIT_IMAGE}
-
+        olm.relatedImage.v2_4.cni: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-istio-cni-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.grafana: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-grafana-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.pilot: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-pilot-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.prometheus: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-prometheus-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.proxyv2: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-proxyv2-rhel8:${OSSM_24}
+        olm.relatedImage.v2_4.rls: registry-proxy.engineering.redhat.com/rh-osbs/openshift-service-mesh-ratelimit-rhel8:${OSSM_24}
+        # 3.0 images
+        olm.relatedImage.v3_0.cni: ${OSSM_CNI_IMAGE}
+        olm.relatedImage.v3_0.pilot: ${OSSM_PILOT_IMAGE}
+        olm.relatedImage.v3_0.proxyv2: ${OSSM_PROXY_IMAGE}
+        olm.relatedImage.v3_0.rls: ${OSSM_RATELIMIT_IMAGE}
         oauth-proxy.query: "true"
         oauth-proxy.namespace: openshift
         oauth-proxy.name: oauth-proxy