Add namespace and OperatorGroup for GitOps Operator

juliaaano · Aug 28, 2024 · 2007607 · 2007607
1 parent 7c32cb0
commit 2007607
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,9 +3,7 @@ name: helm release
 on:
   workflow_dispatch:
   push:
-    branches: [main]
-    paths:
-      - 'charts/**'
+    tags: [v*]
 
 jobs:
   release:

diff --git a/charts/openshift-gitops/templates/operator.yaml b/charts/openshift-gitops/templates/operator.yaml
@@ -1,5 +1,21 @@
 {{ if .Values.operator.install -}}
 ---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.operator.namespace }}
+  annotations:
+    openshift.io/display-name: "GitOps Operator"
+    openshift.io/description: "Red Hat OpenShift GitOps Operator"
+---
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: {{ .Values.operator.name }}
+  namespace: {{ .Values.operator.namespace }}
+spec:
+  upgradeStrategy: Default
+---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:

diff --git a/charts/openshift-gitops/values.yaml b/charts/openshift-gitops/values.yaml
@@ -6,12 +6,12 @@
 operator:
   install: false
   name: openshift-gitops-operator
-  namespace: openshift-operators
+  namespace: openshift-gitops-operator
   channel: latest
   installPlanApproval: Automatic
   source: redhat-operators
   sourceNamespace: openshift-marketplace
-  # startingCSV: openshift-gitops-operator.v1.13.1
+  # startingCSV: openshift-gitops-operator.x.y.z
 
 # Configures the ArgoCD instance when argocd.install is true.
 # The configuration of any of the components below is optional, so you can uncomment and set the values as needed.