feat: upgrade argo-cd to v2.3.0 GA (#12)

Signed-off-by: Jesse Suen <jesse@akuity.io>

charts/argo-cd/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-version: 1.1.2
-appVersion: 2.3.0-rc5
+version: 1.1.3
+appVersion: 2.3.0
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
 home: https://charts.akuity.io

charts/argo-cd/templates/applicationset-controller/deployment.yaml

@@ -19,6 +19,7 @@ spec:
     spec:
       containers:
       - command:
+        - entrypoint.sh
         - applicationset-controller
         env:
         - name: NAMESPACE
@@ -30,6 +31,7 @@ spec:
         name: argocd-applicationset-controller
         ports:
         - containerPort: 7000
+          name: webhook
         volumeMounts:
         - mountPath: /app/config/ssh
           name: ssh-known-hosts

charts/argo-cd/templates/applicationset-controller/service.yaml

@@ -13,7 +13,7 @@ spec:
   - name: webhook
     port: 7000
     protocol: TCP
-    targetPort: 7000
+    targetPort: webhook
   selector:
     app.kubernetes.io/name: argocd-applicationset-controller
 {{- end }}

charts/argo-cd/values.yaml

@@ -6,7 +6,7 @@ global:
     # -- If defined, a repository applied to all ArgoCD deployments
     repository: quay.io/akuity/argocd
     # -- If defined, a tag applied to all ArgoCD deployments
-    tag: v2.3.0-rc5-ak.0
+    tag: v2.3.0-ak.0
     # -- If defined, an image pull policy will be applied to all ArgoCD deployments
     pullPolicy: # IfNotPresent
 
@@ -126,7 +126,7 @@ applicationsetController:
   enabled: false
   image:
     repository: quay.io/argoproj/argocd-applicationset # defaults to global.image.repository
-    tag: v0.3.0 # defaults to global.image.tag
+    tag: v0.4.0
     pullPolicy: # IfNotPresent
 
 # -- Argo Configuration
@@ -350,5 +350,5 @@ imageUpdater:
   enabled: false
   image:
     repository: argoprojlabs/argocd-image-updater
-    pullPolicy: Always
+    pullPolicy: # IfNotPresent
     tag: v0.11.3

hack/compare-cd.sh

@@ -5,32 +5,43 @@ PROJECT_ROOT=$(cd $(dirname ${BASH_SOURCE})/..; pwd)
 chart_root="${PROJECT_ROOT}/charts/argo-cd"
 upstream_version=v$(grep appVersion ${chart_root}/Chart.yaml | awk '{print $2}')
 
-mytmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir')
-
+helm_tmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'helm')
 helm dependency update ${chart_root} 2>&1 >/dev/null
 helm template \
     --include-crds \
     --set global.image.repository=quay.io/argoproj/argocd \
     --set global.image.tag=${upstream_version} \
+    --set global.image.pullPolicy=Always \
     --set notificationsController.enabled=true \
     --set applicationsetController.enabled=true \
-    --namespace argocd ${chart_root} | grep -v imagePullPolicy > $mytmpdir/helm.yaml
-
-echo "Helm template output is located in: $mytmpdir"
+    --namespace argocd ${chart_root} | grep -v imagePullPolicy > $helm_tmpdir/helm.yaml
 
 echo """
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+
+namespace: argocd
 resources:
 - helm.yaml
-""" > $mytmpdir/kustomization.yaml
-
-helm_out=$(kustomize build $mytmpdir)
+""" > $helm_tmpdir/kustomization.yaml
 
-upstream_out=$(
-    curl --silent https://raw.githubusercontent.com/argoproj/argo-cd/${upstream_version}/manifests/ha/install.yaml | \
-    grep -v imagePullPolicy | \
-    grep -v "This is an auto-generated file"
-)
+upstream_tmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'upstream')
+echo """
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 
-diff <(echo "$helm_out") <(echo "$upstream_out")
+namespace: argocd
+resources:
+- https://raw.githubusercontent.com/argoproj/argo-cd/${upstream_version}/manifests/ha/install.yaml
+""" > $upstream_tmpdir/kustomization.yaml
+
+diff_dir=$(mktemp -d 2>/dev/null || mktemp -d -t 'diff')
+helm_out=$(kustomize build $helm_tmpdir > $diff_dir/helm.yaml)
+upstream_out=$(kustomize build $upstream_tmpdir \
+    | grep -v imagePullPolicy \
+    | grep -v "^data: null$" \
+    > $diff_dir/upstream.yaml)
+diff $diff_dir/upstream.yaml $diff_dir/helm.yaml
+
+echo "Helm template output is located in: $diff_dir/helm.yaml"
+echo "Upstream output is located in: $diff_dir/upstream.yaml"