diff --git a/build/util/Dockerfile b/build/util/Dockerfile index 72bf1fae5..9874cec35 100644 --- a/build/util/Dockerfile +++ b/build/util/Dockerfile @@ -1,5 +1,5 @@ -# Argo CD v2.8.3 -FROM quay.io/argoproj/argocd@sha256:d40da8f5747415eb7f9b5c2d9b645aecd423888cad9b36e4f986bff8ecf0a786 as argocd +# Argo CD v2.8.6 +FROM quay.io/argoproj/argocd@sha256:712ff6ac413d74951988fdf82b1c8f433770be4d85b5ed013f848be0c164d0b9 as argocd # Final Image FROM docker.io/library/ubuntu:22.04 diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml index 5301692cb..d55d520ac 100644 --- a/bundle/manifests/argocd-operator.clusterserviceversion.yaml +++ b/bundle/manifests/argocd-operator.clusterserviceversion.yaml @@ -1742,7 +1742,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator:v0.8.0 + image: quay.io/argoprojlabs/argocd-operator@sha256:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f livenessProbe: httpGet: path: /healthz diff --git a/common/defaults.go b/common/defaults.go index 2912428e8..2520a8402 100644 --- a/common/defaults.go +++ b/common/defaults.go @@ -61,7 +61,7 @@ const ( ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd" // ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified. - ArgoCDDefaultArgoVersion = "sha256:d40da8f5747415eb7f9b5c2d9b645aecd423888cad9b36e4f986bff8ecf0a786" // v2.8.3 + ArgoCDDefaultArgoVersion = "sha256:712ff6ac413d74951988fdf82b1c8f433770be4d85b5ed013f848be0c164d0b9" // v2.8.6 // ArgoCDDefaultBackupKeyLength is the length of the generated default backup key. ArgoCDDefaultBackupKeyLength = 32 @@ -119,7 +119,7 @@ const ( ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util" // ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified. - ArgoCDDefaultExportJobVersion = "sha256:6f80965a2bef1c80875be0995b18d9be5a6ad4af841cbc170ed3c60101a7deb2" // 0.5.0 + ArgoCDDefaultExportJobVersion = "sha256:dfd3833b199a2e452940ed37a6175323e8fb0be5f2c8ea87f1d21330236679f1" // 0.8.0 // ArgoCDDefaultExportLocalCapicity is the default capacity to use for local export. ArgoCDDefaultExportLocalCapicity = "2Gi" diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index d9f21e827..5ae3991d0 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -11,6 +11,6 @@ configMapGenerator: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: -- name: controller +- digest: sha256:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f + name: controller newName: quay.io/argoprojlabs/argocd-operator - newTag: v0.8.0 diff --git a/deploy/catalog_source.yaml b/deploy/catalog_source.yaml index 25dd01a9d..30a4931ba 100644 --- a/deploy/catalog_source.yaml +++ b/deploy/catalog_source.yaml @@ -4,6 +4,6 @@ metadata: name: argocd-catalog spec: sourceType: grpc - image: quay.io/argoprojlabs/argocd-operator-registry@sha256:dcf6d07ed5c8b840fb4a6e9019eacd88cd0913bc3c8caa104d3414a2e9972002 # replace with your index image + image: quay.io/argoprojlabs/argocd-operator-registry@sha256:ccae1c0a80ad5846d73f7fdfcb20947daec2d50274619440011543d0cc527e19 # replace with your index image displayName: Argo CD Operators publisher: Argo CD Community \ No newline at end of file diff --git a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml index 5301692cb..d55d520ac 100644 --- a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml @@ -1742,7 +1742,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator:v0.8.0 + image: quay.io/argoprojlabs/argocd-operator@sha256:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f livenessProbe: httpGet: path: /healthz diff --git a/deploy/olm-catalog/argocd-operator/argocd-operator.package.yaml b/deploy/olm-catalog/argocd-operator/argocd-operator.package.yaml index 956740872..1cd25094b 100644 --- a/deploy/olm-catalog/argocd-operator/argocd-operator.package.yaml +++ b/deploy/olm-catalog/argocd-operator/argocd-operator.package.yaml @@ -1,5 +1,5 @@ channels: -- currentCSV: argocd-operator.v0.7.0 +- currentCSV: argocd-operator.v0.8.0 name: alpha defaultChannel: alpha packageName: argocd-operator diff --git a/go.mod b/go.mod index 17e4be573..ef76604db 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/argoproj-labs/argocd-operator go 1.20 require ( - github.com/argoproj/argo-cd/v2 v2.8.3 + github.com/argoproj/argo-cd/v2 v2.8.6 github.com/coreos/prometheus-operator v0.40.0 github.com/go-logr/logr v1.2.4 github.com/google/go-cmp v0.5.9 @@ -61,7 +61,7 @@ require ( golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.9.0 // indirect + golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect diff --git a/go.sum b/go.sum index cd4888607..9f8a89ec6 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,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/argo-cd/v2 v2.8.3 h1:ybJ7eNoP7/u5Vqncais6WeVRBEGmZmriAIwLEKmWHIA= -github.com/argoproj/argo-cd/v2 v2.8.3/go.mod h1:Pkw7r6HKh5k/5Ynl4MvwCG79ktYBk+7PbJxCjXSlT30= +github.com/argoproj/argo-cd/v2 v2.8.6 h1:0Fh9EaOj3C3MUwW/lNehWkwXU3sUPCkdKdDuesOBYrk= +github.com/argoproj/argo-cd/v2 v2.8.6/go.mod h1:tTVb2cffiAxi7a0M8LFNU+KtLVNp8z4aCB4CJjRFs/A= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -2125,8 +2125,8 @@ golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= -golang.org/x/oauth2 v0.9.0 h1:BPpt2kU7oMRq3kCHAA1tbSEshXRw1LpG2ztgDwrzuAs= -golang.org/x/oauth2 v0.9.0/go.mod h1:qYgFZaFiu6Wg24azG8bdV52QJXJGbZzIIsRCdVKzbLw= +golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= +golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=