From d7a0f9df9832da992432fda6781ffd54c474f073 Mon Sep 17 00:00:00 2001 From: John Mazzitelli Date: Mon, 16 Sep 2024 11:49:27 -0400 Subject: [PATCH] prepare for 2.0 - rename OLM metadata 1.90 to 2.0.0 (#819) --- .../{1.90.0 => 2.0.0}/bundle.Dockerfile | 0 .../{1.90.0 => 2.0.0}/manifests/kiali.crd.yaml | 0 .../kiali.v2.0.0.clusterserviceversion.yaml} | 14 +++++++------- .../manifests/ossmconsole.crd.yaml | 0 .../{1.90.0 => 2.0.0}/metadata/annotations.yaml | 0 .../{1.90.0 => 2.0.0}/bundle.Dockerfile | 0 .../{1.90.0 => 2.0.0}/manifests/kiali.crd.yaml | 0 .../kiali.v2.0.0.clusterserviceversion.yaml} | 14 +++++++------- .../{1.90.0 => 2.0.0}/metadata/annotations.yaml | 0 9 files changed, 14 insertions(+), 14 deletions(-) rename manifests/kiali-community/{1.90.0 => 2.0.0}/bundle.Dockerfile (100%) rename manifests/kiali-community/{1.90.0 => 2.0.0}/manifests/kiali.crd.yaml (100%) rename manifests/kiali-community/{1.90.0/manifests/kiali.v1.90.0.clusterserviceversion.yaml => 2.0.0/manifests/kiali.v2.0.0.clusterserviceversion.yaml} (98%) rename manifests/kiali-community/{1.90.0 => 2.0.0}/manifests/ossmconsole.crd.yaml (100%) rename manifests/kiali-community/{1.90.0 => 2.0.0}/metadata/annotations.yaml (100%) rename manifests/kiali-upstream/{1.90.0 => 2.0.0}/bundle.Dockerfile (100%) rename manifests/kiali-upstream/{1.90.0 => 2.0.0}/manifests/kiali.crd.yaml (100%) rename manifests/kiali-upstream/{1.90.0/manifests/kiali.v1.90.0.clusterserviceversion.yaml => 2.0.0/manifests/kiali.v2.0.0.clusterserviceversion.yaml} (98%) rename manifests/kiali-upstream/{1.90.0 => 2.0.0}/metadata/annotations.yaml (100%) diff --git a/manifests/kiali-community/1.90.0/bundle.Dockerfile b/manifests/kiali-community/2.0.0/bundle.Dockerfile similarity index 100% rename from manifests/kiali-community/1.90.0/bundle.Dockerfile rename to manifests/kiali-community/2.0.0/bundle.Dockerfile diff --git a/manifests/kiali-community/1.90.0/manifests/kiali.crd.yaml b/manifests/kiali-community/2.0.0/manifests/kiali.crd.yaml similarity index 100% rename from manifests/kiali-community/1.90.0/manifests/kiali.crd.yaml rename to manifests/kiali-community/2.0.0/manifests/kiali.crd.yaml diff --git a/manifests/kiali-community/1.90.0/manifests/kiali.v1.90.0.clusterserviceversion.yaml b/manifests/kiali-community/2.0.0/manifests/kiali.v2.0.0.clusterserviceversion.yaml similarity index 98% rename from manifests/kiali-community/1.90.0/manifests/kiali.v1.90.0.clusterserviceversion.yaml rename to manifests/kiali-community/2.0.0/manifests/kiali.v2.0.0.clusterserviceversion.yaml index eb1e36b86..acb9f7e7f 100644 --- a/manifests/kiali-community/1.90.0/manifests/kiali.v1.90.0.clusterserviceversion.yaml +++ b/manifests/kiali-community/2.0.0/manifests/kiali.v2.0.0.clusterserviceversion.yaml @@ -1,7 +1,7 @@ apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion metadata: - name: kiali-operator.v1.90.0 + name: kiali-operator.v2.0.0 namespace: placeholder labels: operatorframework.io/arch.amd64: supported @@ -9,10 +9,10 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.arm64: supported annotations: - olm.skipRange: '>=1.0.0 <1.90.0' + olm.skipRange: '>=1.0.0 <2.0.0' categories: Monitoring,Logging & Tracing certified: "false" - containerImage: quay.io/kiali/kiali-operator:v1.90.0 + containerImage: quay.io/kiali/kiali-operator:v2.0.0 capabilities: Deep Insights support: Kiali description: "This community operator provides Kiali and OSSMC. Kiali is the Istio observability and management Console. OSSMC is the OpenShift Service Mesh Console plugin, powered by Kiali." @@ -53,7 +53,7 @@ metadata: } ] spec: - version: 1.90.0 + version: 2.0.0 maturity: stable replaces: kiali-operator.v1.89.0 displayName: Kiali Community Operator @@ -232,9 +232,9 @@ spec: app: kiali-operator # required for the operator SDK metric service selector name: kiali-operator - version: v1.90.0 + version: v2.0.0 app.kubernetes.io/name: kiali-operator - app.kubernetes.io/version: v1.90.0 + app.kubernetes.io/version: v2.0.0 app.kubernetes.io/part-of: kiali-operator annotations: prometheus.io/scrape: "true" @@ -244,7 +244,7 @@ spec: serviceAccountName: kiali-operator containers: - name: operator - image: quay.io/kiali/kiali-operator:v1.90.0 + image: quay.io/kiali/kiali-operator:v2.0.0 imagePullPolicy: "IfNotPresent" args: - "--zap-log-level=info" diff --git a/manifests/kiali-community/1.90.0/manifests/ossmconsole.crd.yaml b/manifests/kiali-community/2.0.0/manifests/ossmconsole.crd.yaml similarity index 100% rename from manifests/kiali-community/1.90.0/manifests/ossmconsole.crd.yaml rename to manifests/kiali-community/2.0.0/manifests/ossmconsole.crd.yaml diff --git a/manifests/kiali-community/1.90.0/metadata/annotations.yaml b/manifests/kiali-community/2.0.0/metadata/annotations.yaml similarity index 100% rename from manifests/kiali-community/1.90.0/metadata/annotations.yaml rename to manifests/kiali-community/2.0.0/metadata/annotations.yaml diff --git a/manifests/kiali-upstream/1.90.0/bundle.Dockerfile b/manifests/kiali-upstream/2.0.0/bundle.Dockerfile similarity index 100% rename from manifests/kiali-upstream/1.90.0/bundle.Dockerfile rename to manifests/kiali-upstream/2.0.0/bundle.Dockerfile diff --git a/manifests/kiali-upstream/1.90.0/manifests/kiali.crd.yaml b/manifests/kiali-upstream/2.0.0/manifests/kiali.crd.yaml similarity index 100% rename from manifests/kiali-upstream/1.90.0/manifests/kiali.crd.yaml rename to manifests/kiali-upstream/2.0.0/manifests/kiali.crd.yaml diff --git a/manifests/kiali-upstream/1.90.0/manifests/kiali.v1.90.0.clusterserviceversion.yaml b/manifests/kiali-upstream/2.0.0/manifests/kiali.v2.0.0.clusterserviceversion.yaml similarity index 98% rename from manifests/kiali-upstream/1.90.0/manifests/kiali.v1.90.0.clusterserviceversion.yaml rename to manifests/kiali-upstream/2.0.0/manifests/kiali.v2.0.0.clusterserviceversion.yaml index 6765866ae..d9788995d 100644 --- a/manifests/kiali-upstream/1.90.0/manifests/kiali.v1.90.0.clusterserviceversion.yaml +++ b/manifests/kiali-upstream/2.0.0/manifests/kiali.v2.0.0.clusterserviceversion.yaml @@ -1,7 +1,7 @@ apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion metadata: - name: kiali-operator.v1.90.0 + name: kiali-operator.v2.0.0 namespace: placeholder labels: operatorframework.io/arch.amd64: supported @@ -9,10 +9,10 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.arm64: supported annotations: - olm.skipRange: '>=1.0.0 <1.90.0' + olm.skipRange: '>=1.0.0 <2.0.0' categories: Monitoring,Logging & Tracing certified: "false" - containerImage: quay.io/kiali/kiali-operator:v1.90.0 + containerImage: quay.io/kiali/kiali-operator:v2.0.0 capabilities: Deep Insights support: Kiali description: "Kiali project provides answers to the questions: What microservices are part of my Istio service mesh and how are they connected?" @@ -39,7 +39,7 @@ metadata: } ] spec: - version: 1.90.0 + version: 2.0.0 maturity: stable replaces: kiali-operator.v1.89.0 displayName: Kiali Operator @@ -183,9 +183,9 @@ spec: app: kiali-operator # required for the operator SDK metric service selector name: kiali-operator - version: v1.90.0 + version: v2.0.0 app.kubernetes.io/name: kiali-operator - app.kubernetes.io/version: v1.90.0 + app.kubernetes.io/version: v2.0.0 app.kubernetes.io/part-of: kiali-operator annotations: prometheus.io/scrape: "true" @@ -195,7 +195,7 @@ spec: serviceAccountName: kiali-operator containers: - name: operator - image: quay.io/kiali/kiali-operator:v1.90.0 + image: quay.io/kiali/kiali-operator:v2.0.0 imagePullPolicy: "IfNotPresent" args: - "--zap-log-level=info" diff --git a/manifests/kiali-upstream/1.90.0/metadata/annotations.yaml b/manifests/kiali-upstream/2.0.0/metadata/annotations.yaml similarity index 100% rename from manifests/kiali-upstream/1.90.0/metadata/annotations.yaml rename to manifests/kiali-upstream/2.0.0/metadata/annotations.yaml