Merge pull request validatedpatterns#288 from mbaldessari/gitops-1.8

gitops 1.8

Author: mbaldessari

acm/templates/policies/ocp-gitops-policy.yaml

@@ -35,7 +35,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: stable
+                  channel: gitops-1.8
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators

operator-install/crds/gitops.hybrid-cloud-patterns.io_patterns.yaml

@@ -1,5 +1,3 @@
-
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -84,7 +82,7 @@ spec:
                     type: string
                   operatorChannel:
                     description: 'Channel to deploy openshift-gitops from. Default:
-                      stable'
+                      gitops-1.8'
                     type: string
                   operatorSource:
                     description: 'Source to deploy openshift-gitops from. Default:
@@ -102,19 +100,24 @@ spec:
                       from TargetRepo is broken
                     type: string
                   originRepo:
-                    description: Unused
+                    description: Upstream git repo containing the pattern to deploy.
+                      Used when in-cluster fork to point to the upstream pattern repository
                     type: string
+                  originRevision:
+                    description: Branch, tag or commit in the upstream git repository.
+                      Does not support short-sha's. Default to HEAD
+                    type: string
+                  pollInterval:
+                    description: 'Interval in seconds to poll for drifts between origin
+                      and target repositories. Default: 180 seconds'
+                    type: integer
                   targetRepo:
                     description: Git repo containing the pattern to deploy. Must use
                       https/http
                     type: string
                   targetRevision:
                     description: 'Branch, tag, or commit to deploy.  Does not support
-                      short-sha''s. Default: main'
-                    type: string
-                  valuesDirectoryURL:
-                    description: Optional. Alternate URL to obtain Helm values files
-                      from instead of this pattern.
+                      short-sha''s. Default: HEAD'
                     type: string
                 required:
                 - targetRepo
@@ -126,6 +129,8 @@ spec:
           status:
             description: PatternStatus defines the observed state of Pattern
             properties:
+              appClusterDomain:
+                type: string
               clusterDomain:
                 type: string
               clusterID:
@@ -134,6 +139,36 @@ spec:
                 type: string
               clusterPlatform:
                 type: string
+              clusterVersion:
+                type: string
+              conditions:
+                items:
+                  properties:
+                    lastTransitionTime:
+                      description: Last time the condition transitioned from one status
+                        to another.
+                      format: date-time
+                      type: string
+                    lastUpdateTime:
+                      description: The last time this condition was updated.
+                      format: date-time
+                      type: string
+                    message:
+                      description: A human readable message indicating details about
+                        the transition.
+                      type: string
+                    status:
+                      description: Status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: Type of deployment condition.
+                      type: string
+                  required:
+                  - lastUpdateTime
+                  - status
+                  - type
+                  type: object
+                type: array
               lastError:
                 description: Last error encountered by the pattern
                 type: string

operator-install/templates/pattern.yaml

@@ -9,11 +9,11 @@ spec:
     targetRepo: {{ .Values.main.git.repoURL }}
     targetRevision: {{ .Values.main.git.revision }}
   gitOpsSpec:
-    operatorChannel: {{ default "stable" .Values.main.gitops.channel }}
+    operatorChannel: {{ default "gitops-1.8" .Values.main.gitops.channel }}
 {{- if .Values.main.extraParameters }}
   extraParameters:
 {{- range .Values.main.extraParameters }}
   - name: {{ .name }}
     value: {{ .value }}
 {{- end }}
-{{- end }}
+{{- end }}

operator-install/values.yaml

@@ -4,6 +4,6 @@ main:
     revision: main
 
   gitops:
-    channel: "stable"
+    channel: "gitops-1.8"
 
   clusterGroupName: default

reference-output.yaml

@@ -112,7 +112,7 @@ metadata:
   labels:
     operators.coreos.com/openshift-gitops-operator.openshift-operators: ""
 spec:
-  channel: stable
+  channel: gitops-1.8
   installPlanApproval: Automatic
   name: openshift-gitops-operator
   source: redhat-operators

tests/acm-industrial-edge-factory.expected.yaml

@@ -87,7 +87,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: stable
+                  channel: gitops-1.8
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators

tests/acm-industrial-edge-hub.expected.yaml

@@ -289,7 +289,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: stable
+                  channel: gitops-1.8
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators

tests/acm-medical-diagnosis-hub.expected.yaml

@@ -280,7 +280,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: stable
+                  channel: gitops-1.8
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators

tests/acm-naked.expected.yaml

@@ -87,7 +87,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: stable
+                  channel: gitops-1.8
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators

tests/acm-normal.expected.yaml

@@ -790,7 +790,7 @@ spec:
                   labels:
                     operators.coreos.com/openshift-gitops-operator.openshift-operators: ''
                 spec:
-                  channel: stable
+                  channel: gitops-1.8
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators