Bump Argo, CAPZ versions (#95)

Also fix the values.yaml file issue
Azure-Samples · Sep 12, 2024 · 3f3e20f · 3f3e20f
1 parent a502b72
commit 3f3e20f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/gitops/bootstrap/control-plane/addons/azure/addons-cert-manager-appset.yaml b/gitops/bootstrap/control-plane/addons/azure/addons-cert-manager-appset.yaml
@@ -14,7 +14,7 @@ spec:
               values:
                 addonChart: cert-manager
                 # anything not staging or prod use this version
-                addonChartVersion: v1.15.1
+                addonChartVersion: v1.15.3
                 addonChartRepository: https://charts.jetstack.io
               selector:
                 matchExpressions:
@@ -29,13 +29,13 @@ spec:
                 matchLabels:
                   environment: staging
               values:
-                addonChartVersion: v1.15.1
+                addonChartVersion: v1.15.3
           - clusters:
               selector:
                 matchLabels:
                   environment: prod
               values:
-                addonChartVersion: v1.15.1
+                addonChartVersion: v1.15.3
   template:
     metadata:
       name: addon-{{name}}-{{values.addonChart}}

diff --git a/gitops/bootstrap/control-plane/addons/oss/addons-argo-cd-appset.yaml b/gitops/bootstrap/control-plane/addons/oss/addons-argo-cd-appset.yaml
@@ -14,7 +14,7 @@ spec:
               values:
                 addonChart: argo-cd
                 # anything not staging or prod use this version
-                addonChartVersion: 7.3.11
+                addonChartVersion: 7.5.2
                 addonChartRepositoryNamespace: argocd
                 addonChartRepository: https://argoproj.github.io/argo-helm
               selector:
@@ -27,13 +27,13 @@ spec:
                 matchLabels:
                   environment: control-plane
               values:
-                addonChartVersion: 7.3.11
+                addonChartVersion: 7.5.2
           - clusters:
               selector:
                 matchLabels:
                   environment: prod
               values:
-                addonChartVersion: 7.3.11
+                addonChartVersion: 7.5.2
   template:
     metadata:
       name: addon-{{name}}-{{values.addonChart}}

diff --git a/gitops/bootstrap/control-plane/addons/oss/addons-argo-rollouts-appset.yaml b/gitops/bootstrap/control-plane/addons/oss/addons-argo-rollouts-appset.yaml
@@ -14,7 +14,7 @@ spec:
               values:
                 addonChart: argo-rollouts
                 # anything not staging or prod use this version
-                addonChartVersion: 2.37.3
+                addonChartVersion: 2.37.6
                 addonChartRepository: https://argoproj.github.io/argo-helm
               selector:
                 matchExpressions:
@@ -26,13 +26,13 @@ spec:
                 matchLabels:
                   environment: staging
               values:
-                addonChartVersion: 2.37.3
+                addonChartVersion: 2.37.6
           - clusters:
               selector:
                 matchLabels:
                   environment: prod
               values:
-                addonChartVersion: 2.37.3
+                addonChartVersion: 2.37.6
   template:
     metadata:
       name: addon-{{name}}-{{values.addonChart}}

diff --git a/gitops/bootstrap/control-plane/addons/oss/addons-argo-workflows-appset.yaml b/gitops/bootstrap/control-plane/addons/oss/addons-argo-workflows-appset.yaml
@@ -15,7 +15,7 @@ spec:
               values:
                 addonChart: argo-workflows
                 # anything not staging or prod use this version
-                addonChartVersion: 0.41.14
+                addonChartVersion: 0.42.1
                 addonChartRepository: https://argoproj.github.io/argo-helm
               selector:
                 matchExpressions:
@@ -27,13 +27,13 @@ spec:
                 matchLabels:
                   environment: staging
               values:
-                addonChartVersion: 0.41.14
+                addonChartVersion: 0.42.1
           - clusters:
               selector:
                 matchLabels:
                   environment: prod
               values:
-                addonChartVersion: 0.41.14
+                addonChartVersion: 0.42.1
   template:
     metadata:
       name: addon-{{.name}}-{{.values.addonChart}}

diff --git a/gitops/bootstrap/control-plane/addons/oss/addons-kargo-appset.yaml b/gitops/bootstrap/control-plane/addons/oss/addons-kargo-appset.yaml
@@ -14,7 +14,7 @@ spec:
               values:
                 addonChart: kargo
                 # anything not staging or prod use this version
-                addonChartVersion: 0.8.1
+                addonChartVersion: 0.8.7
                 addonChartRepositoryNamespace: kargo
                 addonChartRepository: ghcr.io/akuity/kargo-charts
               selector:
@@ -27,13 +27,13 @@ spec:
                 matchLabels:
                   environment: control-plane
               values:
-                addonChartVersion: 0.8.1
+                addonChartVersion: 0.8.7
           - clusters:
               selector:
                 matchLabels:
                   environment: prod
               values:
-                addonChartVersion: 0.8.1
+                addonChartVersion: 0.8.7
   template:
     metadata:
       name: addon-{{name}}-{{values.addonChart}}

diff --git a/gitops/environments/default/addons/cluster-api-provider-azure/values.yaml b/gitops/environments/default/addons/cluster-api-provider-azure/values.yaml
@@ -1,13 +1,12 @@
-core: "cluster-api:v1.8.1"
-infrastructure: "azure:v1.16.0"
+core: "cluster-api:v1.8.3"
+infrastructure: "azure:v1.16.1"
 addon: "helm:v0.2.5"
 manager:
   featureGates:
     core:
       MachinePool: true
     azure:
       MachinePool: true
----
 additionalDeployments:
   azureserviceoperator-controller-manager:
     deployment:

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -250,6 +250,6 @@ module "gitops_bridge_bootstrap" {
   apps = local.argocd_apps
   argocd = {
     namespace     = local.argocd_namespace
-    chart_version = "7.3.4"
+    chart_version = "7.5.2"
   }
 }