Skip to content

Commit

Permalink
feat: upgrade Argo CD for release v.9.0 (argoproj-labs#1082)
Browse files Browse the repository at this point in the history
* feat: upgrade Argo CD for release v.9.0

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

* fix: unit test failures

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

---------

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>
  • Loading branch information
iam-veeramalla authored Nov 24, 2023
1 parent 18a0a8d commit a78a842
Show file tree
Hide file tree
Showing 23 changed files with 40,126 additions and 54 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.8.0
VERSION ?= 0.9.0

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
Expand Down
4 changes: 2 additions & 2 deletions build/util/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Argo CD v2.8.3
FROM quay.io/argoproj/argocd@sha256:644c386facf25940291f8e41330422c203240bc0d7da484405cf8fc6c766fe8f as argocd
# Argo CD v2.9.2
FROM quay.io/argoproj/argocd@sha256:8576d347f30fa4c56a0129d1c0a0f5ed1e75662f0499f1ed7e917c405fd909dc as argocd

# Final Image
FROM docker.io/library/ubuntu:22.04
Expand Down
6 changes: 3 additions & 3 deletions bundle/manifests/argocd-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/argoproj-labs/argocd-operator
support: Argo CD
name: argocd-operator.v0.8.0
name: argocd-operator.v0.9.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -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:v0.9.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -1833,7 +1833,7 @@ spec:
provider:
name: Argo CD Community
replaces: argocd-operator.v0.7.0
version: 0.8.0
version: 0.9.0
webhookdefinitions:
- admissionReviewVersions:
- v1alpha1
Expand Down
389 changes: 383 additions & 6 deletions bundle/manifests/argoproj.io_applications.yaml

Large diffs are not rendered by default.

1,495 changes: 1,483 additions & 12 deletions bundle/manifests/argoproj.io_applicationsets.yaml

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions bundle/manifests/argoproj.io_appprojects.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,18 @@ spec:
properties:
name:
description: Name is an alternate way of specifying the target
cluster by its symbolic name
cluster by its symbolic name. This must be set if Server is
not set.
type: string
namespace:
description: Namespace specifies the target namespace for the
application's resources. The namespace will only be set for
namespace-scoped resources that have not set a value for .metadata.namespace
type: string
server:
description: Server specifies the URL of the target cluster
and must be set to the Kubernetes control plane API
description: Server specifies the URL of the target cluster's
Kubernetes control plane API. This must be set if Name is
not set.
type: string
type: object
type: array
Expand Down
2 changes: 1 addition & 1 deletion common/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:8576d347f30fa4c56a0129d1c0a0f5ed1e75662f0499f1ed7e917c405fd909dc" // v2.9.2

// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
ArgoCDDefaultBackupKeyLength = 32
Expand Down
391 changes: 384 additions & 7 deletions config/crd/bases/argoproj.io_applications.yaml

Large diffs are not rendered by default.

1,497 changes: 1,484 additions & 13 deletions config/crd/bases/argoproj.io_applicationsets.yaml

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions config/crd/bases/argoproj.io_appprojects.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,18 @@ spec:
properties:
name:
description: Name is an alternate way of specifying the target
cluster by its symbolic name
cluster by its symbolic name. This must be set if Server is
not set.
type: string
namespace:
description: Namespace specifies the target namespace for the
application's resources. The namespace will only be set for
namespace-scoped resources that have not set a value for .metadata.namespace
type: string
server:
description: Server specifies the URL of the target cluster
and must be set to the Kubernetes control plane API
description: Server specifies the URL of the target cluster's
Kubernetes control plane API. This must be set if Name is
not set.
type: string
type: object
type: array
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/argoprojlabs/argocd-operator
newTag: v0.8.0
newTag: v0.9.0
2 changes: 1 addition & 1 deletion controllers/argocd/dex_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ func TestReconcileArgoCD_reconcileDexDeployment_withUpdate(t *testing.T) {
InitContainers: []corev1.Container{
{
Name: "copyutil",
Image: "quay.io/argoproj/argocd@sha256:d40da8f5747415eb7f9b5c2d9b645aecd423888cad9b36e4f986bff8ecf0a786",
Image: "quay.io/argoproj/argocd@sha256:8576d347f30fa4c56a0129d1c0a0f5ed1e75662f0499f1ed7e917c405fd909dc",
Command: []string{
"cp",
"-n",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
control-plane: argocd-operator
name: argocd-operator-controller-manager-metrics-service
spec:
ports:
- name: https
port: 8443
targetPort: 8080
selector:
control-plane: argocd-operator
status:
loadBalancer: {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
data:
controller_manager_config.yaml: |
apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
kind: ControllerManagerConfig
health:
healthProbeBindAddress: :8081
metrics:
bindAddress: 127.0.0.1:8080
webhook:
port: 9443
leaderElection:
leaderElect: true
resourceName: b674928d.argoproj.io
kind: ConfigMap
metadata:
name: argocd-operator-manager-config
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: argocd-operator-metrics-reader
rules:
- nonResourceURLs:
- /metrics
verbs:
- get
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
name: argocd-operator-webhook-service
spec:
ports:
- port: 443
protocol: TCP
targetPort: 9443
selector:
control-plane: argocd-operator
status:
loadBalancer: {}
Loading

0 comments on commit a78a842

Please sign in to comment.