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 index 30e02b67..69ebfe71 100644 --- 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: 6.5.0 + addonChartVersion: 6.7.14 addonChartRepositoryNamespace: argocd addonChartRepository: https://argoproj.github.io/argo-helm selector: @@ -30,13 +30,13 @@ spec: matchLabels: environment: control-plane values: - addonChartVersion: 6.5.0 + addonChartVersion: 6.7.14 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 6.5.0 + addonChartVersion: 6.7.14 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/gitops/environments/default/addons/cluster-api-operator/values.yaml b/gitops/environments/default/addons/cluster-api-operator/values.yaml index dab3fff7..d5edbb2e 100644 --- a/gitops/environments/default/addons/cluster-api-operator/values.yaml +++ b/gitops/environments/default/addons/cluster-api-operator/values.yaml @@ -1,11 +1,12 @@ addon: helm -infrastructure: "azure:v1.13.2" -core: "cluster-api:v1.6.2" +infrastructure: "azure:v1.14.2" +core: "cluster-api:v1.7.1" manager: featureGates: core: MachinePool: true - ClusterTopology: true + addon: + helm: true azure: MachinePool: true ClusterResourceSet: true diff --git a/terraform/main.tf b/terraform/main.tf index dd776268..8551963f 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -209,7 +209,7 @@ module "gitops_bridge_bootstrap" { apps = local.argocd_apps argocd = { namespace = local.argocd_namespace - chart_version = "6.5.0" + chart_version = "6.7.14" } }