From 82064b27c52986566e812316117fac44bd2081e8 Mon Sep 17 00:00:00 2001 From: Regina Scott Date: Fri, 7 Jul 2023 12:39:11 -0400 Subject: [PATCH 1/3] updated Argo CD 2.7.6 CRDs and argocd-operator --- bundle/manifests/argoproj.io_applications.yaml | 17 ++--------------- .../gitops-operator.clusterserviceversion.yaml | 2 +- config/crd/bases/argoproj.io_applications.yaml | 17 ++--------------- config/manifests/patches/description.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- 6 files changed, 9 insertions(+), 35 deletions(-) diff --git a/bundle/manifests/argoproj.io_applications.yaml b/bundle/manifests/argoproj.io_applications.yaml index 5a6d15a02..5c15166c3 100644 --- a/bundle/manifests/argoproj.io_applications.yaml +++ b/bundle/manifests/argoproj.io_applications.yaml @@ -1428,7 +1428,7 @@ spec: as part of automated sync (default: false)' type: boolean selfHeal: - description: 'SelfHeal specifies whether to revert resources + description: 'SelfHeal specifes whether to revert resources back to their desired state upon modification in the cluster (default: false)' type: boolean @@ -1492,7 +1492,7 @@ spec: conditions items: description: ApplicationCondition contains details about an application - condition, which is usually an error or warning + condition, which is usally an error or warning properties: lastTransitionTime: description: LastTransitionTime is the time the condition was @@ -2941,19 +2941,6 @@ spec: syncResult: description: SyncResult is the result of a Sync operation properties: - managedNamespaceMetadata: - description: ManagedNamespaceMetadata contains the current - sync state of managed namespace metadata - properties: - annotations: - additionalProperties: - type: string - type: object - labels: - additionalProperties: - type: string - type: object - type: object resources: description: Resources contains a list of sync result items for each individual resource in a sync operation diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index 1a9a5d771..974552eb3 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -259,7 +259,7 @@ spec: Audit trails of rollouts to the clusters\n* Monitoring and logging integration with OpenShift\n* Automated GitOps bootstrapping using Tekton and Argo CD with [GitOps Application Manager CLI](https://github.com/redhat-developer/kam)\n\n## - Components\n* Argo CD 2.7.2\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n## + Components\n* Argo CD 2.7.6\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n## How to Install \nAfter installing the OpenShift GitOps operator, an instance of Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges for managing cluster configurations. You can create additional Argo CD instances diff --git a/config/crd/bases/argoproj.io_applications.yaml b/config/crd/bases/argoproj.io_applications.yaml index e346015d0..6cebf7cdb 100644 --- a/config/crd/bases/argoproj.io_applications.yaml +++ b/config/crd/bases/argoproj.io_applications.yaml @@ -1427,7 +1427,7 @@ spec: as part of automated sync (default: false)' type: boolean selfHeal: - description: 'SelfHeal specifies whether to revert resources + description: 'SelfHeal specifes whether to revert resources back to their desired state upon modification in the cluster (default: false)' type: boolean @@ -1491,7 +1491,7 @@ spec: conditions items: description: ApplicationCondition contains details about an application - condition, which is usually an error or warning + condition, which is usally an error or warning properties: lastTransitionTime: description: LastTransitionTime is the time the condition was @@ -2940,19 +2940,6 @@ spec: syncResult: description: SyncResult is the result of a Sync operation properties: - managedNamespaceMetadata: - description: ManagedNamespaceMetadata contains the current - sync state of managed namespace metadata - properties: - annotations: - additionalProperties: - type: string - type: object - labels: - additionalProperties: - type: string - type: object - type: object resources: description: Resources contains a list of sync result items for each individual resource in a sync operation diff --git a/config/manifests/patches/description.yaml b/config/manifests/patches/description.yaml index a3b1a73cd..489ad5fce 100644 --- a/config/manifests/patches/description.yaml +++ b/config/manifests/patches/description.yaml @@ -13,7 +13,7 @@ Audit trails of rollouts to the clusters\n* Monitoring and logging integration with OpenShift\n* Automated GitOps bootstrapping using Tekton and Argo CD with [GitOps Application Manager CLI](https://github.com/redhat-developer/kam)\n\n## - Components\n* Argo CD 2.7.2\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n## + Components\n* Argo CD 2.7.6\n* GitOps Application Manager CLI ([download](https://github.com/redhat-developer/kam/releases))\n\n## How to Install \nAfter installing the OpenShift GitOps operator, an instance of Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges for managing cluster configurations. You can create additional Argo CD instances diff --git a/go.mod b/go.mod index e38a88658..9a639bf75 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5 - github.com/argoproj-labs/argocd-operator v0.0.16-0.20230703172554-566de5160d52 + github.com/argoproj-labs/argocd-operator v0.0.16-0.20230707151228-cbc97a02a8ce github.com/coreos/prometheus-operator v0.40.0 github.com/go-logr/logr v1.2.4 github.com/google/go-cmp v0.5.9 diff --git a/go.sum b/go.sum index afd70365a..5bdb5a633 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,8 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5 h1:SlFbeNb42H7DUGzE9B/uYYjlQjNSR4y+eaWiTqN3PGs= github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5/go.mod h1:AiEjAr6e/DCDiicjoC7W7LaZdO28sfgoBhjbGryzEZ8= -github.com/argoproj-labs/argocd-operator v0.0.16-0.20230703172554-566de5160d52 h1:DRnECV/XUunMA2P94HzjT6OSHve+KJE/k+wHFmfG8Og= -github.com/argoproj-labs/argocd-operator v0.0.16-0.20230703172554-566de5160d52/go.mod h1:5gJtEVwehEm9qt4Wi76Dyyi6Y36XHLkNNJ1EKrthZTg= +github.com/argoproj-labs/argocd-operator v0.0.16-0.20230707151228-cbc97a02a8ce h1:GuZLI2a4qTQVT4ZPKX4fPQgtAWiiOUaQ0Hqpnri6RLM= +github.com/argoproj-labs/argocd-operator v0.0.16-0.20230707151228-cbc97a02a8ce/go.mod h1:5gJtEVwehEm9qt4Wi76Dyyi6Y36XHLkNNJ1EKrthZTg= github.com/argoproj/argo-cd/v2 v2.7.6 h1:AKRQm0fLGgBmKQILrpc/2PZM2WYlfCP5tquU6DqDudU= github.com/argoproj/argo-cd/v2 v2.7.6/go.mod h1:uRU//iTjnzlCs+hKOKo5Na2OZGNTlklnu/g9Wi4enh4= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= From 97f6dd89e04271c43d4ad31b1e6b5426b7e9b45f Mon Sep 17 00:00:00 2001 From: Regina Scott Date: Mon, 10 Jul 2023 06:37:41 -0400 Subject: [PATCH 2/3] updated kustomize version in test --- .../e2e/sequential/1-031_validate_toolchain/01-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/openshift/e2e/sequential/1-031_validate_toolchain/01-check.yaml b/test/openshift/e2e/sequential/1-031_validate_toolchain/01-check.yaml index 822496e8c..4917967ad 100644 --- a/test/openshift/e2e/sequential/1-031_validate_toolchain/01-check.yaml +++ b/test/openshift/e2e/sequential/1-031_validate_toolchain/01-check.yaml @@ -6,7 +6,7 @@ commands: set -o pipefail # These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix - expected_kustomizeVersion='kustomize/v4.5.7' + expected_kustomizeVersion='kustomize/v5.0.1' expected_helmVersion='v3.10.0' expected_argocdVersion='v2.6.1' expected_dexVersion='v2.35.1' From 538860e45f9c4160d8d2056572e572cbc53d3f12 Mon Sep 17 00:00:00 2001 From: Regina Scott Date: Mon, 10 Jul 2023 11:32:02 -0400 Subject: [PATCH 3/3] fix failing kuttl test --- .../e2e/sequential/1-031_validate_toolchain/01-check.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/openshift/e2e/sequential/1-031_validate_toolchain/01-check.yaml b/test/openshift/e2e/sequential/1-031_validate_toolchain/01-check.yaml index 4917967ad..3369e8784 100644 --- a/test/openshift/e2e/sequential/1-031_validate_toolchain/01-check.yaml +++ b/test/openshift/e2e/sequential/1-031_validate_toolchain/01-check.yaml @@ -6,7 +6,7 @@ commands: set -o pipefail # These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix - expected_kustomizeVersion='kustomize/v5.0.1' + expected_kustomizeVersion='v5.0.1' expected_helmVersion='v3.10.0' expected_argocdVersion='v2.6.1' expected_dexVersion='v2.35.1' @@ -34,9 +34,7 @@ commands: ) kustomizeVersion=$(oc -n openshift-gitops exec $gitops_server_pod \ - -- kustomize version | \ - awk -F':' '{ print $2 }' | \ - awk '{ print $1 }' + -- kustomize version ) helmVersion=$(oc -n openshift-gitops exec $gitops_server_pod \ -- helm version | \