diff --git a/Makefile.vendor.mk b/Makefile.vendor.mk index 369e75a24..85a9d0428 100644 --- a/Makefile.vendor.mk +++ b/Makefile.vendor.mk @@ -1,6 +1,6 @@ -VERSION = 3.0.0 +VERSION = 3.0.0-tp.1 OPERATOR_NAME = servicemeshoperator3 HUB = quay.io/maistra-dev -CHANNELS = 3.0 +CHANNELS = candidates HELM_VALUES_FILE = ossm/values.yaml VERSIONS_YAML_FILE = versions.yaml diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 20dfc703f..616c29d5d 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,7 +5,7 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=servicemeshoperator3 -LABEL operators.operatorframework.io.bundle.channels.v1="3.0" +LABEL operators.operatorframework.io.bundle.channels.v1="candidates" LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.34.1 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 diff --git a/bundle/manifests/operator.istio.io_istiocnis.yaml b/bundle/manifests/operator.istio.io_istiocnis.yaml index d4bf63b68..b76ec113e 100644 --- a/bundle/manifests/operator.istio.io_istiocnis.yaml +++ b/bundle/manifests/operator.istio.io_istiocnis.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 creationTimestamp: null name: istiocnis.operator.istio.io spec: diff --git a/bundle/manifests/operator.istio.io_istiorevisions.yaml b/bundle/manifests/operator.istio.io_istiorevisions.yaml index 47c2df93f..f8f50ed6e 100644 --- a/bundle/manifests/operator.istio.io_istiorevisions.yaml +++ b/bundle/manifests/operator.istio.io_istiorevisions.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 creationTimestamp: null name: istiorevisions.operator.istio.io spec: diff --git a/bundle/manifests/operator.istio.io_istios.yaml b/bundle/manifests/operator.istio.io_istios.yaml index 9a51f32b0..166d3321c 100644 --- a/bundle/manifests/operator.istio.io_istios.yaml +++ b/bundle/manifests/operator.istio.io_istios.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 creationTimestamp: null name: istios.operator.istio.io spec: diff --git a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml index b75662dd7..5b624e09a 100644 --- a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml +++ b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml @@ -33,8 +33,8 @@ metadata: ] capabilities: Seamless Upgrades categories: OpenShift Optional, Integration & Delivery, Networking, Security - containerImage: quay.io/maistra-dev/sail-operator:3.0-latest - createdAt: "2024-04-19T07:45:59Z" + containerImage: registry.gitlab.com/dgrimm/istio/sail-operator:dgn + createdAt: "2024-04-29T09:19:22Z" description: The OpenShift Service Mesh Operator enables you to install, configure, and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service Mesh is based on the open source Istio project. @@ -55,7 +55,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/istio-ecosystem/sail-operator support: Red Hat, Inc. - name: servicemeshoperator3.v3.0.0 + name: servicemeshoperator3.v3.0.0-tp.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -538,7 +538,7 @@ spec: - --default-profile=openshift command: - /manager - image: quay.io/maistra-dev/sail-operator:3.0-latest + image: registry.gitlab.com/dgrimm/istio/sail-operator:dgn imagePullPolicy: Always livenessProbe: httpGet: @@ -638,4 +638,4 @@ spec: maturity: alpha provider: name: Red Hat, Inc. - version: 3.0.0 + version: 3.0.0-tp.1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index d0c8af368..c8249c332 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,7 +4,7 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: servicemeshoperator3 - operators.operatorframework.io.bundle.channels.v1: "3.0" + operators.operatorframework.io.bundle.channels.v1: "candidates" operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 diff --git a/chart/crds/operator.istio.io_istiocnis.yaml b/chart/crds/operator.istio.io_istiocnis.yaml index b947f710b..ba70c8e90 100644 --- a/chart/crds/operator.istio.io_istiocnis.yaml +++ b/chart/crds/operator.istio.io_istiocnis.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: istiocnis.operator.istio.io spec: group: operator.istio.io diff --git a/chart/crds/operator.istio.io_istiorevisions.yaml b/chart/crds/operator.istio.io_istiorevisions.yaml index f2ed71bf4..aa225caf9 100644 --- a/chart/crds/operator.istio.io_istiorevisions.yaml +++ b/chart/crds/operator.istio.io_istiorevisions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: istiorevisions.operator.istio.io spec: group: operator.istio.io diff --git a/chart/crds/operator.istio.io_istios.yaml b/chart/crds/operator.istio.io_istios.yaml index 349a94566..335d99ff1 100644 --- a/chart/crds/operator.istio.io_istios.yaml +++ b/chart/crds/operator.istio.io_istios.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: istios.operator.istio.io spec: group: operator.istio.io