Merge pull request #272 from sabre1041/openshift-gitops-1.11-support

Update to support OpenShift GitOps 1.11
redhat-cop · Jan 10, 2024 · 8420dbc · 8420dbc
2 parents 8f846a1 + 30e9fef
commit 8420dbc
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 4 deletions.
diff --git a/openshift-gitops-operator/README.md b/openshift-gitops-operator/README.md
@@ -14,6 +14,7 @@ The current *overlays* available are for the following channels:
 * [gitops-1.8](operator/overlays/gitops-1.8)
 * [gitops-1.9](operator/overlays/gitops-1.9)
 * [gitops-1.10](operator/overlays/gitops-1.10)
+* [gitops-1.11](operator/overlays/gitops-1.11)
 * [latest](operator/overlays/latest)
 * [preview](operator/overlays/preview)
 

diff --git a/openshift-gitops-operator/operator/components/openshift-gitops-operator/README.md b/openshift-gitops-operator/operator/components/openshift-gitops-operator/README.md
@@ -0,0 +1,19 @@
+# openshift-gitops-operator
+
+## Purpose
+This component is creates a `Namespace` and `OperatorGroup` to enable the installation of the OpenShift GitOps Operator.
+
+## Usage
+
+This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file:
+
+```
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/openshift-gitops-operator
+```
diff --git a/openshift-gitops-operator/operator/components/openshift-gitops-operator/kustomization.yaml b/openshift-gitops-operator/operator/components/openshift-gitops-operator/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - namespace.yaml
+  - operatorgroup.yaml
diff --git a/openshift-gitops-operator/operator/components/openshift-gitops-operator/namespace.yaml b/openshift-gitops-operator/operator/components/openshift-gitops-operator/namespace.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-gitops-operator
+  annotations:
+    openshift.io/display-name: "OpenShift GitOps Operator"
+  labels:
+    openshift.io/cluster-monitoring: 'true'
diff --git a/openshift-gitops-operator/operator/components/openshift-gitops-operator/operatorgroup.yaml b/openshift-gitops-operator/operator/components/openshift-gitops-operator/operatorgroup.yaml
@@ -0,0 +1,6 @@
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: openshift-gitops-operator
+  namespace: openshift-gitops-operator
+spec: {}
diff --git a/openshift-gitops-operator/operator/overlays/gitops-1.11/README.md b/openshift-gitops-operator/operator/overlays/gitops-1.11/README.md
@@ -0,0 +1 @@
+Installs the *gitops-1.10* channel version of the OpenShift GitOps Operator.  This channel tracks updates to OpenShift GitOps 1.10.
diff --git a/openshift-gitops-operator/operator/overlays/gitops-1.11/kustomization.yaml b/openshift-gitops-operator/operator/overlays/gitops-1.11/kustomization.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/openshift-gitops-operator
+
+patches:
+  - target:
+      kind: Subscription
+      name: openshift-gitops-operator
+    path: patch-subscription.yaml
diff --git a/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-subscription.yaml b/openshift-gitops-operator/operator/overlays/gitops-1.11/patch-subscription.yaml
@@ -0,0 +1,6 @@
+- op: replace
+  path: /spec/channel
+  value: gitops-1.11
+- op: replace
+  path: /metadata/namespace
+  value: openshift-gitops-operator
diff --git a/openshift-gitops-operator/operator/overlays/latest/kustomization.yaml b/openshift-gitops-operator/operator/overlays/latest/kustomization.yaml
@@ -4,8 +4,11 @@ kind: Kustomization
 resources:
   - ../../base
 
+components:
+  - ../../components/openshift-gitops-operator
+
 patches:
   - target:
       kind: Subscription
       name: openshift-gitops-operator
-    path: patch-channel.yaml
+    path: patch-subscription.yaml
diff --git a/openshift-gitops-operator/operator/overlays/latest/patch-channel.yaml b/openshift-gitops-operator/operator/overlays/latest/patch-channel.yaml
diff --git a/openshift-gitops-operator/operator/overlays/latest/patch-subscription.yaml b/openshift-gitops-operator/operator/overlays/latest/patch-subscription.yaml
@@ -0,0 +1,6 @@
+- op: replace
+  path: /spec/channel
+  value: latest
+- op: replace
+  path: /metadata/namespace
+  value: openshift-gitops-operator
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Installs the gitops-1.10 channel version of the OpenShift GitOps Operator. This channel tracks updates to OpenShift GitOps 1.10.