Automated merge

* upstream/main: Remove automatic channel prefix detection (istio-ecosystem#574) Create IstioRevisionTag documentation (istio-ecosystem#511) # Conflicts: # bundle/manifests/sailoperator.clusterserviceversion.yaml
openshift-service-mesh-bot · Jan 22, 2025 · 78e3764 · 78e3764
2 parents 5ff1248 + 41a1cc8
commit 78e3764
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 30 deletions.
diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -80,9 +80,6 @@ GINKGO_FLAGS := $(if $(VERBOSE),-v) $(if $(CI),--no-color) $(if $(COVERAGE),-cov
 # - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
 # - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
 CHANNEL_PREFIX := dev
-ifneq (,$(findstring release-,$(shell git rev-parse --abbrev-ref HEAD)))
-CHANNEL_PREFIX = stable
-endif
 
 CHANNELS ?= $(CHANNEL_PREFIX)-$(MINOR_VERSION)
 ifneq ($(origin CHANNELS), undefined)

diff --git a/api/v1alpha1/istiorevisiontags_types.go b/api/v1alpha1/istiorevisiontags_types.go
@@ -31,7 +31,7 @@ type IstioRevisionTagSpec struct {
 	TargetRef IstioRevisionTagTargetReference `json:"targetRef"`
 }
 
-// IstioRevisionTagTargetReference can reference either Istio or IstioRevision objects in the cluster.
+// IstioRevisionTagTargetReference can reference either Istio or IstioRevision objects in the cluster. In the case of referencing an Istio object, the Sail Operator will automatically update the reference to the Istio object's Active Revision.
 type IstioRevisionTagTargetReference struct {
 	// Kind is the kind of the target resource.
 	//
@@ -181,7 +181,7 @@ const (
 // +kubebuilder:printcolumn:name="Revision",type="string",JSONPath=".status.istioRevision",description="The IstioRevision this object is referencing."
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The age of the object"
 
-// IstioRevisionTag references a Istio or IstioRevision object and serves as an alias for sidecar injection.
+// IstioRevisionTag references an Istio or IstioRevision object and serves as an alias for sidecar injection. It can be used to manage stable revision tags without having to use istioctl or helm directly. See https://istio.io/latest/docs/setup/upgrade/canary/#stable-revision-labels for more information on the concept.
 type IstioRevisionTag struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -192,7 +192,7 @@ type IstioRevisionTag struct {
 
 // +kubebuilder:object:root=true
 
-// IstioRevisionList contains a list of IstioRevision
+// IstioRevisionTagList contains a list of IstioRevisionTags
 type IstioRevisionTagList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`

diff --git a/bundle/manifests/sailoperator.io_istiorevisiontags.yaml b/bundle/manifests/sailoperator.io_istiorevisiontags.yaml
@@ -38,8 +38,10 @@ spec:
     name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: IstioRevisionTag references a Istio or IstioRevision object and
-          serves as an alias for sidecar injection.
+        description: IstioRevisionTag references an Istio or IstioRevision object
+          and serves as an alias for sidecar injection. It can be used to manage stable
+          revision tags without having to use istioctl or helm directly. See https://istio.io/latest/docs/setup/upgrade/canary/#stable-revision-labels
+          for more information on the concept.
         properties:
           apiVersion:
             description: |-
@@ -63,7 +65,9 @@ spec:
             properties:
               targetRef:
                 description: IstioRevisionTagTargetReference can reference either
-                  Istio or IstioRevision objects in the cluster.
+                  Istio or IstioRevision objects in the cluster. In the case of referencing
+                  an Istio object, the Sail Operator will automatically update the
+                  reference to the Istio object's Active Revision.
                 properties:
                   kind:
                     description: Kind is the kind of the target resource.

diff --git a/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml b/bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
@@ -34,7 +34,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: OpenShift Optional, Integration & Delivery, Networking, Security
     containerImage: quay.io/maistra-dev/sail-operator:3.0-latest
-    createdAt: "2025-01-20T12:15:21Z"
+    createdAt: "2025-01-22T12:11:26Z"
     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.
@@ -218,8 +218,10 @@ spec:
         displayName: Helm Values
         path: values
       version: v1alpha1
-    - description: IstioRevisionTag references a Istio or IstioRevision object and
-        serves as an alias for sidecar injection.
+    - description: IstioRevisionTag references an Istio or IstioRevision object and
+        serves as an alias for sidecar injection. It can be used to manage stable
+        revision tags without having to use istioctl or helm directly. See https://istio.io/latest/docs/setup/upgrade/canary/#stable-revision-labels
+        for more information on the concept.
       displayName: Istio Revision Tag
       kind: IstioRevisionTag
       name: istiorevisiontags.sailoperator.io

diff --git a/chart/crds/sailoperator.io_istiorevisiontags.yaml b/chart/crds/sailoperator.io_istiorevisiontags.yaml
@@ -38,8 +38,10 @@ spec:
     name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: IstioRevisionTag references a Istio or IstioRevision object and
-          serves as an alias for sidecar injection.
+        description: IstioRevisionTag references an Istio or IstioRevision object
+          and serves as an alias for sidecar injection. It can be used to manage stable
+          revision tags without having to use istioctl or helm directly. See https://istio.io/latest/docs/setup/upgrade/canary/#stable-revision-labels
+          for more information on the concept.
         properties:
           apiVersion:
             description: |-
@@ -63,7 +65,9 @@ spec:
             properties:
               targetRef:
                 description: IstioRevisionTagTargetReference can reference either
-                  Istio or IstioRevision objects in the cluster.
+                  Istio or IstioRevision objects in the cluster. In the case of referencing
+                  an Istio object, the Sail Operator will automatically update the
+                  reference to the Istio object's Active Revision.
                 properties:
                   kind:
                     description: Kind is the kind of the target resource.