Product changes for TP2 (istio-ecosystem#175)

Signed-off-by: Filip Brychta <fbrychta@redhat.com>

.github/workflows/release.yaml

@@ -9,7 +9,7 @@ on:
       bundle_channels:
         description: "Bundle channels"
         required: true
-        default: stable-0.2
+        default: candidates
       is_draft_release:
         description: "Draft release"
         type: boolean

Makefile.vendor.mk

@@ -0,0 +1,7 @@
+VERSION = 3.0.0-tp.2
+OPERATOR_NAME = servicemeshoperator3
+HUB = quay.io/maistra-dev
+CHANNELS = candidates
+HELM_VALUES_FILE = ossm/values.yaml
+VERSIONS_YAML_FILE = ossm/versions.yaml
+GENERATE_RELATED_IMAGES = false

PROJECT

@@ -8,7 +8,7 @@ layout:
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
-projectName: sailoperator
+projectName: servicemeshoperator3
 repo: github.com/istio-ecosystem/sail-operator
 resources:
 - api:

api/v1alpha1/istio_types.go

@@ -37,9 +37,9 @@ const (
 type IstioSpec struct {
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.24.1, v1.23.3, v1.23.0, v1.22.6, v1.22.4.
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.6", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.4"}
-	// +kubebuilder:validation:Enum=v1.24.1;v1.23.3;v1.23.0;v1.22.6;v1.22.4
+	// Must be one of: v1.24.1, v1.23.0.
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.0"}
+	// +kubebuilder:validation:Enum=v1.24.1;v1.23.0
 	// +kubebuilder:default=v1.24.1
 	Version string `json:"version"`
 

api/v1alpha1/istiocni_types.go

@@ -28,9 +28,9 @@ const (
 type IstioCNISpec struct {
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.24.1, v1.23.3, v1.23.0, v1.22.6, v1.22.4.
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.6", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.4"}
-	// +kubebuilder:validation:Enum=v1.24.1;v1.23.3;v1.23.0;v1.22.6;v1.22.4
+	// Must be one of: v1.24.1, v1.23.0.
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.0"}
+	// +kubebuilder:validation:Enum=v1.24.1;v1.23.0
 	// +kubebuilder:default=v1.24.1
 	Version string `json:"version"`
 

api/v1alpha1/istiorevision_types.go

@@ -30,9 +30,9 @@ const (
 type IstioRevisionSpec struct {
 	// +sail:version
 	// Defines the version of Istio to install.
-	// Must be one of: v1.24.1, v1.23.3, v1.23.0, v1.22.6, v1.22.4.
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.3", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.0", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.6", "urn:alm:descriptor:com.tectonic.ui:select:v1.22.4"}
-	// +kubebuilder:validation:Enum=v1.24.1;v1.23.3;v1.23.0;v1.22.6;v1.22.4
+	// Must be one of: v1.24.1, v1.23.0.
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1,displayName="Istio Version",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldGroup:General", "urn:alm:descriptor:com.tectonic.ui:select:v1.24.1", "urn:alm:descriptor:com.tectonic.ui:select:v1.23.0"}
+	// +kubebuilder:validation:Enum=v1.24.1;v1.23.0
 	Version string `json:"version"`
 
 	// Namespace to which the Istio components should be installed.

bundle.Dockerfile

@@ -4,8 +4,8 @@ FROM scratch
 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=sailoperator
-LABEL operators.operatorframework.io.bundle.channels.v1="stable-0.2"
+LABEL operators.operatorframework.io.bundle.package.v1=servicemeshoperator3
+LABEL operators.operatorframework.io.bundle.channels.v1="candidates"
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.38.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4

bundle/manifests/metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml

@@ -4,11 +4,11 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: sailoperator
+    app.kubernetes.io/created-by: servicemeshoperator3
     app.kubernetes.io/instance: metrics-reader
     app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/part-of: sailoperator
+    app.kubernetes.io/part-of: servicemeshoperator3
   name: metrics-reader
 rules:
 - nonResourceURLs: