Move channel into the subscription

Use the same structure as ocm samplesp[1], keeping the channel in the subscription kustomization under the application namespace. This is better for users, removing one step from the deployment steps. Now it is not possible to forget to deploy the channel. This is better for developers, since now we can test multiple applications concurrently, without dealing with setup and cleanup of shared resources, since application do not share the channel. [1] https://github.com/open-cluster-management-io/multicloud-operators-subscription/tree/main/examples/github-channel Signed-off-by: Nir Soffer <[email protected]>
RamenDR · Nov 27, 2023 · 48c0bee · 48c0bee
1 parent 847de94
commit 48c0bee
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -38,19 +38,6 @@ OCM Stateful application samples, including Ramen resources.
    kubectl get drcluster,drpolicy
    ```
 
-1. Setup the common OCM channel resources on the hub:
-
-   ```
-   kubectl apply -k channel
-   ```
-
-   This creates a Channel resource in the `ramen-samples` namespace and
-   can be viewed using:
-
-   ```
-   kubectl get channel ramen-gitops -n ramen-samples
-   ```
-
 ## The sample applications
 
 This repository provides sample applications that can be deployed on
@@ -150,12 +137,13 @@ Applications:
    kubectl apply -k k8s/busybox-regional-rbd-deploy/sub
    ```
 
-   This creates the required Subscription, Placement, and
+   This creates the required Channel, Subscription, Placement, and
    ManagedClusterSetBinding resources for the busybox application in the
    `busybox-regional-rbd-deploy` namespace and can be viewed using:
 
    ```
-   kubectl get subscription,placement -n busybox-regional-rbd-deploy
+   kubectl get channel,subscription,placement,managedclusterbinding \
+       -n busybox-regional-rbd-deploy
    ```
 
 1. Inspect subscribed resources from the channel created in the same

diff --git a/channel/kustomization.yaml b/channel/kustomization.yaml
diff --git a/channel/namespace.yaml b/channel/namespace.yaml
diff --git a/k8s/busybox-regional-rbd-deploy/sub/kustomization.yaml b/k8s/busybox-regional-rbd-deploy/sub/kustomization.yaml
@@ -14,3 +14,6 @@ patches:
       - op: replace
         path: /metadata/annotations/apps.open-cluster-management.io~1github-path
         value: k8s/busybox-regional-rbd-deploy/app
+      - op: replace
+        path: /spec/channel
+        value: busybox-regional-rbd-deploy/ocm-ramen-samples
diff --git a/k8s/busybox-regional-rbd-ds/sub/kustomization.yaml b/k8s/busybox-regional-rbd-ds/sub/kustomization.yaml
@@ -14,3 +14,6 @@ patches:
       - op: replace
         path: /metadata/annotations/apps.open-cluster-management.io~1github-path
         value: k8s/busybox-regional-rbd-ds/app
+      - op: replace
+        path: /spec/channel
+        value: busybox-regional-rbd-ds/ocm-ramen-samples
diff --git a/k8s/busybox-regional-rbd-sts/sub/kustomization.yaml b/k8s/busybox-regional-rbd-sts/sub/kustomization.yaml
@@ -14,3 +14,6 @@ patches:
       - op: replace
         path: /metadata/annotations/apps.open-cluster-management.io~1github-path
         value: k8s/busybox-regional-rbd-sts/app
+      - op: replace
+        path: /spec/channel
+        value: busybox-regional-rbd-sts/ocm-ramen-samples
diff --git a/odr/busybox-metro-rbd-deploy/sub/kustomization.yaml b/odr/busybox-metro-rbd-deploy/sub/kustomization.yaml
@@ -14,3 +14,6 @@ patches:
       - op: replace
         path: /metadata/annotations/apps.open-cluster-management.io~1github-path
         value: odr/busybox-metro-rbd-deploy/app
+      - op: replace
+        path: /spec/channel
+        value: busybox-metro-rbd-deploy/ocm-ramen-samples
diff --git a/odr/busybox-regional-cephfs-deploy/sub/kustomization.yaml b/odr/busybox-regional-cephfs-deploy/sub/kustomization.yaml
@@ -14,3 +14,6 @@ patches:
       - op: replace
         path: /metadata/annotations/apps.open-cluster-management.io~1github-path
         value: odr/busybox-regional-cephfs-deploy/app
+      - op: replace
+        path: /spec/channel
+        value: busybox-regional-cephfs-deploy/ocm-ramen-samples
diff --git a/odr/busybox-regional-rbd-deploy/sub/kustomization.yaml b/odr/busybox-regional-rbd-deploy/sub/kustomization.yaml
@@ -14,3 +14,6 @@ patches:
       - op: replace
         path: /metadata/annotations/apps.open-cluster-management.io~1github-path
         value: odr/busybox-regional-rbd-deploy/app
+      - op: replace
+        path: /spec/channel
+        value: busybox-regional-rbd-deploy/ocm-ramen-samples
diff --git a/channel/channel.yaml → subscription/channel.yaml b/channel/channel.yaml → subscription/channel.yaml
@@ -2,8 +2,7 @@
 apiVersion: apps.open-cluster-management.io/v1
 kind: Channel
 metadata:
-  name: ramen-gitops
-  namespace: ramen-samples
+  name: ocm-ramen-samples
 spec:
   type: GitHub
   pathname: https://github.com/RamenDR/ocm-ramen-samples.git
diff --git a/subscription/kustomization.yaml b/subscription/kustomization.yaml
@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - namespace.yaml
+  - channel.yaml
   - binding.yaml
   - placement.yaml
   - subscription.yaml
diff --git a/subscription/subscription.yaml b/subscription/subscription.yaml
@@ -7,7 +7,7 @@ metadata:
     apps.open-cluster-management.io/github-path: busybox/deployment
   name: busybox-sub
 spec:
-  channel: ramen-samples/ramen-gitops
+  channel: busybox-sample/ocm-ramen-samples
   placement:
     placementRef:
       kind: Placement