Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OSSM-3551 Add metadata stub for 3.0 #1128

Merged
merged 2 commits into from Mar 17, 2023
Merged

OSSM-3551 Add metadata stub for 3.0 #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0d792f
OSSM-3551 Add metadata stub for 3.0
dgn Mar 16, 2023
78da411
Switch to ubi9
dgn Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Expand Up @@ -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-3.0
ISTIO_VERSION ?= 1.18.0
REPLACES_PRODUCT_CSV ?= 2.4.0
REPLACES_COMMUNITY_CSV ?= 2.4.0
VERSION ?= development
CONTAINER_CLI ?= docker
COMMUNITY ?= true
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest

ARG build_type=maistra

Expand Down
4 changes: 2 additions & 2 deletions build/manifest-templates/package.yaml
View file
Open in desktop
@@ -1,5 +1,5 @@
packageName: __NAME__
channels:
- name: "2.0"
- name: "3.0"
currentCSV: __NAME__.v__VERSION__
defaultChannel: "2.0"
defaultChannel: "3.0"
6 changes: 3 additions & 3 deletions deploy/maistra-operator.yaml
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 14 additions & 10 deletions deploy/servicemesh-operator.yaml
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions deploy/src/crd.yaml
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
18 changes: 11 additions & 7 deletions deploy/src/deployment-servicemesh.yaml
View file
Open in desktop
Expand Up @@ -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
Expand Down