fix: progressive rollout resource names

leonsteinhaeuser · Nov 21, 2024 · 4cc356f · 4cc356f
1 parent c4d7edf
commit 4cc356f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ To do this, execute the following patch command:
 ```bash
 oc -n openshift-gitops patch argocds.argoproj.io openshift-gitops \
   --type merge \
-  --patch '{"spec":{"sourceNamespaces":["openshift-gitops","example-application-basic","example-application-progressive","example-application-helm-basic","example-application-helm-progressive"]}}'
+  --patch '{"spec":{"sourceNamespaces":["openshift-gitops","example-application-basic","example-application-basic-servicemesh","example-application-progressive","example-application-helm-basic","example-application-helm-progressive"]}}'
 ```
 
 The `openshift-gitops` namespace is the `default` namespace and might not be necessary to add to the `sourceNamespaces` list. However, it is added here for completeness.

diff --git a/ocp/deployments/manifests/progressive/rollout_number_service.yaml b/ocp/deployments/manifests/progressive/rollout_number_service.yaml
@@ -1,23 +1,23 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout
 metadata:
-  name: rollouts-demo
+  name: &name number-service
   labels: &labels
-    app.kubernetes.io/name: number-service
-    app.kubernetes.io/instance: number-service
+    app.kubernetes.io/name: *name
+    app.kubernetes.io/instance: *name
     app.kubernetes.io/component: api
     app.kubernetes.io/part-of: microservices-demo
 spec:
   replicas: 3
   strategy:
     canary:
       canaryService: number-service-canary
-      stableService: number-service
+      stableService: *name
       trafficRouting:
         plugins:
           argoproj-labs/openshift:
             routes:
-              - number-service
+              - *name
       steps:
       - setWeight: 20
       - pause: {}
@@ -39,7 +39,7 @@ spec:
         runAsGroup: 65535
       automountServiceAccountToken: false
       containers:
-        - name: number-service
+        - name: *name
           image: ghcr.io/leonsteinhaeuser/rh-ocp-examples-number:main
           imagePullPolicy: Always
           ports:

diff --git a/ocp/deployments/manifests/progressive/rollout_status_service.yaml b/ocp/deployments/manifests/progressive/rollout_status_service.yaml
@@ -1,23 +1,23 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout
 metadata:
-  name: rollouts-demo
+  name: &name status-service
   labels: &labels
-    app.kubernetes.io/name: status-service
-    app.kubernetes.io/instance: status-service
+    app.kubernetes.io/name: *name
+    app.kubernetes.io/instance: *name
     app.kubernetes.io/component: api
     app.kubernetes.io/part-of: microservices-demo
 spec:
   replicas: 3
   strategy:
     canary:
       canaryService: status-service-canary
-      stableService: status-service
+      stableService: *name
       trafficRouting:
         plugins:
           argoproj-labs/openshift:
             routes:
-              - status-service
+              - *name
       steps:
       - setWeight: 20
       - pause: {}
@@ -39,7 +39,7 @@ spec:
         runAsGroup: 65535
       automountServiceAccountToken: false
       containers:
-        - name: status-service
+        - name: *name
           image: ghcr.io/leonsteinhaeuser/rh-ocp-examples-status:main
           imagePullPolicy: Always
           ports: