Update to latest commit of argo-rollouts-manager ''efd9a78591b8be58cd…

…65529dbd624306590911b0' (#688) Signed-off-by: Jonathan West <[email protected]>
redhat-developer · Apr 30, 2024 · 4b16a41 · 4b16a41
1 parent 5d26d68
commit 4b16a41
Show file tree

Hide file tree

Showing 7 changed files with 191 additions and 30 deletions.
diff --git a/bundle/manifests/argoproj.io_rolloutmanagers.yaml b/bundle/manifests/argoproj.io_rolloutmanagers.yaml
@@ -153,6 +153,10 @@ spec:
               image:
                 description: Image defines Argo Rollouts controller image (optional)
                 type: string
+              namespaceScoped:
+                description: NamespaceScoped lets you specify if RolloutManager has
+                  to watch a namespace or the whole cluster
+                type: boolean
               nodePlacement:
                 description: NodePlacement defines NodeSelectors and Taints for Rollouts
                   workloads
@@ -213,6 +217,76 @@ spec:
           status:
             description: RolloutManagerStatus defines the observed state of RolloutManager
             properties:
+              conditions:
+                description: Conditions is an array of the RolloutManager's status
+                  conditions
+                items:
+                  description: "Condition contains details for one aspect of the current
+                    state of this API Resource. --- This struct is intended for direct
+                    use as an array at the field path .status.conditions.  For example,
+                    \n type FooStatus struct{ // Represents the observations of a
+                    foo's current state. // Known .status.conditions.type are: \"Available\",
+                    \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+                    // +listType=map // +listMapKey=type Conditions []metav1.Condition
+                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+                    protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                  properties:
+                    lastTransitionTime:
+                      description: lastTransitionTime is the last time the condition
+                        transitioned from one status to another. This should be when
+                        the underlying condition changed.  If that is not known, then
+                        using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: message is a human readable message indicating
+                        details about the transition. This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: observedGeneration represents the .metadata.generation
+                        that the condition was set based upon. For instance, if .metadata.generation
+                        is currently 12, but the .status.conditions[x].observedGeneration
+                        is 9, the condition is out of date with respect to the current
+                        state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: reason contains a programmatic identifier indicating
+                        the reason for the condition's last transition. Producers
+                        of specific condition types may define expected values and
+                        meanings for this field, and whether the values are considered
+                        a guaranteed API. The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                        --- Many .condition.type values are consistent across resources
+                        like Available, but because arbitrary conditions can be useful
+                        (see .node.status.conditions), the ability to deconflict is
+                        important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
               phase:
                 description: 'Phase is a simple, high-level summary of where the RolloutManager
                   is in its lifecycle. There are three possible phase values: Pending:

diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml
@@ -179,15 +179,15 @@ spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-    - description: An AnalysisRun is an instantiation of an AnalysisTemplate.
-        AnalysisRuns are like Jobs in that they eventually complete.
+    - description: An AnalysisRun is an instantiation of an AnalysisTemplate. AnalysisRuns
+        are like Jobs in that they eventually complete.
       displayName: AnalysisRun
       kind: AnalysisRun
       name: analysisruns.argoproj.io
       version: v1alpha1
-    - description: An AnalysisTemplate is a template spec which defines how to
-        perform a canary analysis, such as the metrics, its frequency,
-        and the values which are considered successful or failed.
+    - description: An AnalysisTemplate is a template spec which defines how to perform
+        a canary analysis, such as the metrics, its frequency, and the values which
+        are considered successful or failed.
       displayName: AnalysisTemplate
       kind: AnalysisTemplate
       name: analysistemplates.argoproj.io
@@ -209,6 +209,9 @@ spec:
       kind: AppProject
       name: appprojects.argoproj.io
       version: v1alpha1
+    - kind: ArgoCD
+      name: argocds.argoproj.io
+      version: v1alpha1
     - description: Argo CD is the representation of an Argo CD deployment.
       displayName: Argo CD
       kind: ArgoCD
@@ -260,14 +263,16 @@ spec:
         name: ""
         version: v1
       version: v1beta1
-    - description: A ClusterAnalysisTemplate is like an AnalysisTemplate,but it is not limited to its namespace.
-        It can be used by any Rollout throughout the cluster.
+    - description: A ClusterAnalysisTemplate is like an AnalysisTemplate,but it is
+        not limited to its namespace. It can be used by any Rollout throughout the
+        cluster.
       displayName: ClusterAnalysisTemplate
       kind: ClusterAnalysisTemplate
       name: clusteranalysistemplates.argoproj.io
       version: v1alpha1
-    - description: An Experiment is limited run of one or more ReplicaSets for the purposes of analysis.
-        Experiments typically run for a pre-determined duration, but can also run indefinitely until stopped.
+    - description: An Experiment is limited run of one or more ReplicaSets for the
+        purposes of analysis. Experiments typically run for a pre-determined duration,
+        but can also run indefinitely until stopped.
       displayName: Experiment
       kind: Experiment
       name: experiments.argoproj.io
@@ -277,8 +282,9 @@ spec:
       kind: GitopsService
       name: gitopsservices.pipelines.openshift.io
       version: v1alpha1
-    - description: NotificationsConfigurations contains the notification template used to generate notifications
-        that notify users about important changes in the application state.
+    - description: NotificationsConfigurations contains the notification template
+        used to generate notifications that notify users about important changes in
+        the application state.
       displayName: NotificationsConfiguration
       kind: NotificationsConfiguration
       name: notificationsconfigurations.argoproj.io
@@ -288,6 +294,9 @@ spec:
       kind: RolloutManager
       name: rolloutmanagers.argoproj.io
       version: v1alpha1
+    - kind: Rollout
+      name: rollouts.argoproj.io
+      version: v1alpha1
   description: "Red Hat OpenShift GitOps is a declarative continuous delivery platform
     based on [Argo CD](https://argoproj.github.io/argo-cd/). It enables teams to adopt
     GitOps principles for managing cluster configurations and automating secure and

diff --git a/config/crd/bases/argoproj.io_rolloutmanagers.yaml b/config/crd/bases/argoproj.io_rolloutmanagers.yaml
@@ -154,6 +154,10 @@ spec:
               image:
                 description: Image defines Argo Rollouts controller image (optional)
                 type: string
+              namespaceScoped:
+                description: NamespaceScoped lets you specify if RolloutManager has
+                  to watch a namespace or the whole cluster
+                type: boolean
               nodePlacement:
                 description: NodePlacement defines NodeSelectors and Taints for Rollouts
                   workloads
@@ -214,6 +218,76 @@ spec:
           status:
             description: RolloutManagerStatus defines the observed state of RolloutManager
             properties:
+              conditions:
+                description: Conditions is an array of the RolloutManager's status
+                  conditions
+                items:
+                  description: "Condition contains details for one aspect of the current
+                    state of this API Resource. --- This struct is intended for direct
+                    use as an array at the field path .status.conditions.  For example,
+                    \n type FooStatus struct{ // Represents the observations of a
+                    foo's current state. // Known .status.conditions.type are: \"Available\",
+                    \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+                    // +listType=map // +listMapKey=type Conditions []metav1.Condition
+                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
+                    protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                  properties:
+                    lastTransitionTime:
+                      description: lastTransitionTime is the last time the condition
+                        transitioned from one status to another. This should be when
+                        the underlying condition changed.  If that is not known, then
+                        using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: message is a human readable message indicating
+                        details about the transition. This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: observedGeneration represents the .metadata.generation
+                        that the condition was set based upon. For instance, if .metadata.generation
+                        is currently 12, but the .status.conditions[x].observedGeneration
+                        is 9, the condition is out of date with respect to the current
+                        state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: reason contains a programmatic identifier indicating
+                        the reason for the condition's last transition. Producers
+                        of specific condition types may define expected values and
+                        meanings for this field, and whether the values are considered
+                        a guaranteed API. The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                        --- Many .condition.type values are consistent across resources
+                        like Available, but because arbitrary conditions can be useful
+                        (see .node.status.conditions), the ability to deconflict is
+                        important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
               phase:
                 description: 'Phase is a simple, high-level summary of where the RolloutManager
                   is in its lifecycle. There are three possible phase values: Pending:

diff --git a/config/manifests/bases/gitops-operator.clusterserviceversion.yaml b/config/manifests/bases/gitops-operator.clusterserviceversion.yaml
@@ -18,15 +18,15 @@ spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-    - description: An AnalysisRun is an instantiation of an AnalysisTemplate.
-        AnalysisRuns are like Jobs in that they eventually complete.
+    - description: An AnalysisRun is an instantiation of an AnalysisTemplate. AnalysisRuns
+        are like Jobs in that they eventually complete.
       displayName: AnalysisRun
       kind: AnalysisRun
       name: analysisruns.argoproj.io
       version: v1alpha1
-    - description: An AnalysisTemplate is a template spec which defines how to
-        perform a canary analysis, such as the metrics, its frequency,
-        and the values which are considered successful or failed.
+    - description: An AnalysisTemplate is a template spec which defines how to perform
+        a canary analysis, such as the metrics, its frequency, and the values which
+        are considered successful or failed.
       displayName: AnalysisTemplate
       kind: AnalysisTemplate
       name: analysistemplates.argoproj.io
@@ -99,25 +99,23 @@ spec:
         name: ""
         version: v1
       version: v1beta1
-    - description: A ClusterAnalysisTemplate is like an AnalysisTemplate,but it is not limited to its namespace.
-        It can be used by any Rollout throughout the cluster.
+    - description: A ClusterAnalysisTemplate is like an AnalysisTemplate,but it is
+        not limited to its namespace. It can be used by any Rollout throughout the
+        cluster.
       displayName: ClusterAnalysisTemplate
       kind: ClusterAnalysisTemplate
       name: clusteranalysistemplates.argoproj.io
       version: v1alpha1
-    - description: An Experiment is limited run of one or more ReplicaSets for the purposes of analysis.
-        Experiments typically run for a pre-determined duration, but can also run indefinitely until stopped.
+    - description: An Experiment is limited run of one or more ReplicaSets for the
+        purposes of analysis. Experiments typically run for a pre-determined duration,
+        but can also run indefinitely until stopped.
       displayName: Experiment
       kind: Experiment
       name: experiments.argoproj.io
       version: v1alpha1
-    - description: GitopsService is the Schema for the gitopsservices API
-      displayName: Gitops Service
-      kind: GitopsService
-      name: gitopsservices.pipelines.openshift.io
-      version: v1alpha1
-    - description: NotificationsConfigurations contains the notification template used to generate notifications
-        that notify users about important changes in the application state.
+    - description: NotificationsConfigurations contains the notification template
+        used to generate notifications that notify users about important changes in
+        the application state.
       displayName: NotificationsConfiguration
       kind: NotificationsConfiguration
       name: notificationsconfigurations.argoproj.io
@@ -127,6 +125,11 @@ spec:
       kind: RolloutManager
       name: rolloutmanagers.argoproj.io
       version: v1alpha1
+    - description: GitopsService is the Schema for the gitopsservices API
+      displayName: Gitops Service
+      kind: GitopsService
+      name: gitopsservices.pipelines.openshift.io
+      version: v1alpha1
   displayName: Red Hat OpenShift GitOps
   install:
     spec:

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator
 go 1.21
 
 require (
-	github.com/argoproj-labs/argo-rollouts-manager v0.0.3-0.20240326092147-38002185fc1f
+	github.com/argoproj-labs/argo-rollouts-manager v0.0.3-0.20240411091021-efd9a78591b8
 	github.com/argoproj-labs/argocd-operator v0.10.0
 	github.com/coreos/prometheus-operator v0.40.0
 	github.com/go-logr/logr v1.4.1

diff --git a/go.sum b/go.sum
@@ -637,8 +637,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
-github.com/argoproj-labs/argo-rollouts-manager v0.0.3-0.20240326092147-38002185fc1f h1:ntW8MHRZTmolj5ukRov0vU6vxFohRlXUkwmfvFWcSZM=
-github.com/argoproj-labs/argo-rollouts-manager v0.0.3-0.20240326092147-38002185fc1f/go.mod h1:IsuKl+7NkL/yYh+0H2+Oo3qGoT75f1CcKKfPZaN4XbE=
+github.com/argoproj-labs/argo-rollouts-manager v0.0.3-0.20240411091021-efd9a78591b8 h1:udzUF+oAWFWq4p8MB01q8ZpMVDf9V/8T8fpUnddgNXI=
+github.com/argoproj-labs/argo-rollouts-manager v0.0.3-0.20240411091021-efd9a78591b8/go.mod h1:aCj8qr73LKlj6wtXF7GWJSZJJ8pYAbZSXkKGhwLeI3E=
 github.com/argoproj-labs/argocd-operator v0.10.0 h1:B2k6Rwiff3O7fG3K7nNiFuo9TV7Kr0s/K9f4Mo+5Qak=
 github.com/argoproj-labs/argocd-operator v0.10.0/go.mod h1:4TThdvK88j46P6ybACEhHHqJstdnF+CFHkmlS068dqk=
 github.com/argoproj/argo-cd/v2 v2.10.1 h1:VD06GPeoq14Bo7IfiW+EKim3T1C9xaMElVrEtw+zll0=

diff --git a/scripts/openshiftci-presubmit-all-tests.sh b/scripts/openshiftci-presubmit-all-tests.sh
@@ -27,3 +27,4 @@ export KUBECONFIG=$TMP_DIR/kubeconfig
 # Run e2e test
 make test-e2e
 
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,4 @@ export KUBECONFIG=$TMP_DIR/kubeconfig
		# Run e2e test
		make test-e2e