From 4d771f0f1b5d4972bc36d7c75cd40d8f55423307 Mon Sep 17 00:00:00 2001 From: Carlos Santana Date: Thu, 21 Sep 2023 18:27:06 -0400 Subject: [PATCH 1/2] update gitops-bridge addons 2023-09-21 Signed-off-by: Carlos Santana --- .../addons-aws-csi-ebs-resources-appset.yaml | 4 +-- .../aws/addons-aws-fluentbit-appset.yaml | 6 ++-- .../addons-aws-fluentbit-fargate-appset.yaml | 6 ++-- ...s-aws-load-balancer-controller-appset.yaml | 6 ++-- .../aws/addons-aws-oss-argocd-hub-appset.yaml | 6 ++-- .../addons-aws-oss-argocd-ingress-appset.yaml | 8 ++--- .../addons-aws-oss-cert-manager-appset.yaml | 6 ++-- ...s-aws-oss-crossplane-providers-appset.yaml | 6 ++-- .../addons-aws-oss-external-dns-appset.yaml | 8 ++--- .../addons/oss/addons-argo-cd-appset.yaml | 6 ++-- .../addons/oss/addons-argo-events-appset.yaml | 6 ++-- .../oss/addons-argo-rollouts-appset.yaml | 6 ++-- .../oss/addons-argo-workflows-appset.yaml | 6 ++-- .../oss/addons-cert-manager-appset.yaml | 6 ++-- .../oss/addons-ingress-nginx-appset.yaml | 6 ++-- .../addons-kube-prometheus-stack-appset.yaml | 6 ++-- .../addons/oss/addons-kyverno-appset.yaml | 4 +-- .../oss/addons-prometheus-adapter-appset.yaml | 6 ++-- .../resources/aws-upbound/values.yaml | 2 +- .../crossplane/resources/aws/values.yaml | 2 +- argocd/charts/addons/external-dns/values.yaml | 1 + .../charts/addons/ingress-nginx/values.yaml | 30 ------------------- 22 files changed, 57 insertions(+), 86 deletions(-) diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-csi-ebs-resources-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-csi-ebs-resources-appset.yaml index 60cc17f1..26900cd0 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-csi-ebs-resources-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-csi-ebs-resources-appset.yaml @@ -31,8 +31,8 @@ spec: releaseName: '{{values.addonChart}}' ignoreMissingValueFiles: true valueFiles: - - $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/resources/values.yaml - - $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml + - ../../../../environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/resources/values.yaml + - ../../../../clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml # values: # fileParameters: # - name: diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-appset.yaml index e9296e36..2ec332fa 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-appset.yaml @@ -14,7 +14,7 @@ spec: values: addonChart: aws-for-fluent-bit # anything not staging or prod use this version - addonChartVersion: 0.1.29 + addonChartVersion: 0.1.30 addonChartRepository: https://aws.github.io/eks-charts selector: matchExpressions: @@ -29,13 +29,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 0.1.29 + addonChartVersion: 0.1.30 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 0.1.29 + addonChartVersion: 0.1.30 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-fargate-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-fargate-appset.yaml index 84bd1f12..c55fb6ff 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-fargate-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-fargate-appset.yaml @@ -31,8 +31,8 @@ spec: releaseName: '{{values.addonChart}}' ignoreMissingValueFiles: true valueFiles: - - $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/resources/values.yaml - - $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml + - ../../../../environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/resources/values.yaml + - ../../../../clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml values: | region: {{metadata.annotations.aws_region}} log_group_name: {{metadata.annotations.fargate_fluentbit_log_group_name}} @@ -50,4 +50,4 @@ spec: automated: {} syncOptions: - CreateNamespace=true - - ServerSideApply=true # Big CRDs. + - ServerSideApply=true # Big CRDs. diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-load-balancer-controller-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-load-balancer-controller-appset.yaml index 5d74a5e4..3fa80adc 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-load-balancer-controller-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-load-balancer-controller-appset.yaml @@ -14,7 +14,7 @@ spec: values: addonChart: aws-load-balancer-controller # anything not staging or prod use this version - addonChartVersion: 1.6.0 + addonChartVersion: 1.6.1 addonChartRepository: https://aws.github.io/eks-charts selector: matchExpressions: @@ -29,13 +29,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 1.6.0 + addonChartVersion: 1.6.1 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 1.6.0 + addonChartVersion: 1.6.1 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-hub-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-hub-appset.yaml index 4e8a7339..0763dc9f 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-hub-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-hub-appset.yaml @@ -15,7 +15,7 @@ spec: values: addonChart: argo-cd # anything not staging or prod use this version - addonChartVersion: 5.45.0 + addonChartVersion: 5.46.4 addonChartRepository: https://argoproj.github.io/argo-helm selector: matchExpressions: @@ -30,13 +30,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 5.45.0 + addonChartVersion: 5.46.4 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 5.45.0 + addonChartVersion: 5.46.4 template: metadata: name: addon-{{.name}}-aws-{{.values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-ingress-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-ingress-appset.yaml index 006b18d0..9f8c5787 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-ingress-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-ingress-appset.yaml @@ -15,7 +15,7 @@ spec: values: addonChart: argo-cd # anything not staging or prod use this version - addonChartVersion: 5.45.0 + addonChartVersion: 5.46.4 addonChartRepository: https://argoproj.github.io/argo-helm selector: matchExpressions: @@ -30,13 +30,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 5.45.0 + addonChartVersion: 5.46.4 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 5.45.0 + addonChartVersion: 5.46.4 template: metadata: name: addon-{{.name}}-aws-{{.values.addonChart}} @@ -92,4 +92,4 @@ spec: automated: {} syncOptions: - CreateNamespace=true - - ServerSideApply=true # Big CRDs. + - ServerSideApply=true # Big CRDs. diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-cert-manager-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-cert-manager-appset.yaml index 8fd5904f..df6ed301 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-cert-manager-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-cert-manager-appset.yaml @@ -14,7 +14,7 @@ spec: values: addonChart: cert-manager # anything not staging or prod use this version - addonChartVersion: v1.12.4 + addonChartVersion: v1.13.0 addonChartRepository: https://charts.jetstack.io selector: matchExpressions: @@ -31,13 +31,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: v1.12.4 + addonChartVersion: v1.13.0 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: v1.12.4 + addonChartVersion: v1.13.0 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-crossplane-providers-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-crossplane-providers-appset.yaml index 898113e7..4af3fbae 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-crossplane-providers-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-crossplane-providers-appset.yaml @@ -32,8 +32,8 @@ spec: releaseName: '{{values.addonChart}}-aws' ignoreMissingValueFiles: true valueFiles: - - $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/resources/values.yaml - - $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml + - ../../../../environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/resources/values.yaml + - ../../../../clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml values: | global: enabled_aws: {{metadata.labels.enable_aws_crossplane_provider}} @@ -61,4 +61,4 @@ spec: automated: {} syncOptions: - CreateNamespace=true - - ServerSideApply=true # Big CRDs. + - ServerSideApply=true # Big CRDs. \ No newline at end of file diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-external-dns-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-external-dns-appset.yaml index 1d02bcc0..33302e27 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-external-dns-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-external-dns-appset.yaml @@ -15,7 +15,7 @@ spec: values: addonChart: external-dns # anything not staging or prod use this version - addonChartVersion: 1.13.0 + addonChartVersion: 1.13.1 addonChartRepository: https://kubernetes-sigs.github.io/external-dns selector: matchExpressions: @@ -30,13 +30,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 1.13.0 + addonChartVersion: 1.13.1 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 1.13.0 + addonChartVersion: 1.13.1 template: metadata: name: 'addon-{{.name}}-{{.values.addonChart}}' @@ -62,7 +62,7 @@ spec: name: {{.metadata.annotations.external_dns_service_account}} annotations: eks.amazonaws.com/role-arn: {{.metadata.annotations.external_dns_iam_role_arn}} - domainFilters: + domainFilters: - {{default "" .metadata.annotations.eks_cluster_domain}} txtOwnerId: {{.metadata.annotations.aws_cluster_name}} policy: {{default "upsert-only" .metadata.annotations.external_dns_policy}} diff --git a/argocd/bootstrap/control-plane/addons/oss/addons-argo-cd-appset.yaml b/argocd/bootstrap/control-plane/addons/oss/addons-argo-cd-appset.yaml index aac61eec..c458b2ba 100644 --- a/argocd/bootstrap/control-plane/addons/oss/addons-argo-cd-appset.yaml +++ b/argocd/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: 5.45.0 + addonChartVersion: 5.46.4 addonChartRepositoryNamespace: argocd addonChartRepository: https://argoproj.github.io/argo-helm selector: @@ -30,13 +30,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 5.45.0 + addonChartVersion: 5.46.4 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 5.45.0 + addonChartVersion: 5.46.4 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/oss/addons-argo-events-appset.yaml b/argocd/bootstrap/control-plane/addons/oss/addons-argo-events-appset.yaml index dc8219ea..c5bec835 100644 --- a/argocd/bootstrap/control-plane/addons/oss/addons-argo-events-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/oss/addons-argo-events-appset.yaml @@ -14,7 +14,7 @@ spec: values: addonChart: argo-events # anything not staging or prod use this version - addonChartVersion: 2.4.0 + addonChartVersion: 2.4.1 addonChartRepository: https://argoproj.github.io/argo-helm selector: matchExpressions: @@ -29,13 +29,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 2.4.0 + addonChartVersion: 2.4.1 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 2.4.0 + addonChartVersion: 2.4.1 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/oss/addons-argo-rollouts-appset.yaml b/argocd/bootstrap/control-plane/addons/oss/addons-argo-rollouts-appset.yaml index cc0b7b7c..0b4defa5 100644 --- a/argocd/bootstrap/control-plane/addons/oss/addons-argo-rollouts-appset.yaml +++ b/argocd/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.31.6 + addonChartVersion: 2.32.0 addonChartRepository: https://argoproj.github.io/argo-helm selector: matchExpressions: @@ -29,13 +29,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 2.31.6 + addonChartVersion: 2.32.0 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 2.31.6 + addonChartVersion: 2.32.0 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/oss/addons-argo-workflows-appset.yaml b/argocd/bootstrap/control-plane/addons/oss/addons-argo-workflows-appset.yaml index 198c19db..6e0a2fff 100644 --- a/argocd/bootstrap/control-plane/addons/oss/addons-argo-workflows-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/oss/addons-argo-workflows-appset.yaml @@ -14,7 +14,7 @@ spec: values: addonChart: argo-workflows # anything not staging or prod use this version - addonChartVersion: 0.33.1 + addonChartVersion: 0.33.3 addonChartRepository: https://argoproj.github.io/argo-helm selector: matchExpressions: @@ -29,13 +29,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 0.33.1 + addonChartVersion: 0.33.3 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 0.33.1 + addonChartVersion: 0.33.3 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/oss/addons-cert-manager-appset.yaml b/argocd/bootstrap/control-plane/addons/oss/addons-cert-manager-appset.yaml index 84858a54..cb9c43a0 100644 --- a/argocd/bootstrap/control-plane/addons/oss/addons-cert-manager-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/oss/addons-cert-manager-appset.yaml @@ -14,7 +14,7 @@ spec: values: addonChart: cert-manager # anything not staging or prod use this version - addonChartVersion: v1.12.4 + addonChartVersion: v1.13.0 addonChartRepository: https://charts.jetstack.io selector: matchExpressions: @@ -31,13 +31,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: v1.12.4 + addonChartVersion: v1.13.0 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: v1.12.4 + addonChartVersion: v1.13.0 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/oss/addons-ingress-nginx-appset.yaml b/argocd/bootstrap/control-plane/addons/oss/addons-ingress-nginx-appset.yaml index 6aec644c..32b1ee99 100644 --- a/argocd/bootstrap/control-plane/addons/oss/addons-ingress-nginx-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/oss/addons-ingress-nginx-appset.yaml @@ -15,7 +15,7 @@ spec: values: addonChart: ingress-nginx # anything not staging or prod use this version - addonChartVersion: 4.7.1 + addonChartVersion: 4.7.2 addonChartRepository: https://kubernetes.github.io/ingress-nginx selector: matchExpressions: @@ -30,13 +30,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 4.7.1 + addonChartVersion: 4.7.2 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 4.7.1 + addonChartVersion: 4.7.2 template: metadata: name: addon-{{.name}}-{{.values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/oss/addons-kube-prometheus-stack-appset.yaml b/argocd/bootstrap/control-plane/addons/oss/addons-kube-prometheus-stack-appset.yaml index dd1e4d3e..02d8f4ce 100644 --- a/argocd/bootstrap/control-plane/addons/oss/addons-kube-prometheus-stack-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/oss/addons-kube-prometheus-stack-appset.yaml @@ -14,7 +14,7 @@ spec: values: addonChart: kube-prometheus-stack # anything not staging or prod use this version - addonChartVersion: 50.0.0 + addonChartVersion: 51.0.3 addonChartRepository: https://prometheus-community.github.io/helm-charts selector: matchExpressions: @@ -29,13 +29,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 50.0.0 + addonChartVersion: 51.0.3 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 50.0.0 + addonChartVersion: 51.0.3 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/bootstrap/control-plane/addons/oss/addons-kyverno-appset.yaml b/argocd/bootstrap/control-plane/addons/oss/addons-kyverno-appset.yaml index 71c80ce7..aefb3209 100644 --- a/argocd/bootstrap/control-plane/addons/oss/addons-kyverno-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/oss/addons-kyverno-appset.yaml @@ -67,8 +67,8 @@ spec: helm: ignoreMissingValueFiles: true valueFiles: - - $values/{{metadata.annotations.addons_repo_basepath}}environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/resources/values.yaml - - $values/{{metadata.annotations.addons_repo_basepath}}clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml + - ../../../../environments/{{metadata.labels.environment}}/addons/{{values.addonChart}}/resources/values.yaml + - ../../../../clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml # values: # fileParameters: # - name: diff --git a/argocd/bootstrap/control-plane/addons/oss/addons-prometheus-adapter-appset.yaml b/argocd/bootstrap/control-plane/addons/oss/addons-prometheus-adapter-appset.yaml index 9bd18be1..7f6264ed 100644 --- a/argocd/bootstrap/control-plane/addons/oss/addons-prometheus-adapter-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/oss/addons-prometheus-adapter-appset.yaml @@ -14,7 +14,7 @@ spec: values: addonChart: prometheus-adapter # anything not staging or prod use this version - addonChartVersion: 4.4.1 + addonChartVersion: 4.5.0 addonChartRepository: https://prometheus-community.github.io/helm-charts selector: matchExpressions: @@ -29,13 +29,13 @@ spec: matchLabels: environment: staging values: - addonChartVersion: 4.4.1 + addonChartVersion: 4.5.0 - clusters: selector: matchLabels: environment: prod values: - addonChartVersion: 4.4.1 + addonChartVersion: 4.5.0 template: metadata: name: addon-{{name}}-{{values.addonChart}} diff --git a/argocd/charts/addons/crossplane/resources/aws-upbound/values.yaml b/argocd/charts/addons/crossplane/resources/aws-upbound/values.yaml index 3ba2970d..80ff61e8 100644 --- a/argocd/charts/addons/crossplane/resources/aws-upbound/values.yaml +++ b/argocd/charts/addons/crossplane/resources/aws-upbound/values.yaml @@ -1,7 +1,7 @@ global: iam_role_arn_aws_upbound: null enabled_aws_upbound: true - aws_upbound_version: v0.38.0 + aws_upbound_version: v0.40.0 aws_upbound_registry: xpkg.upbound.io/upbound controllerConfig: diff --git a/argocd/charts/addons/crossplane/resources/aws/values.yaml b/argocd/charts/addons/crossplane/resources/aws/values.yaml index d58b742a..fa66c298 100644 --- a/argocd/charts/addons/crossplane/resources/aws/values.yaml +++ b/argocd/charts/addons/crossplane/resources/aws/values.yaml @@ -23,7 +23,7 @@ provider: labels: {} package: registry: xpkg.upbound.io/crossplane-contrib/provider-aws - version: "v0.42.0" + version: "v0.43.1" providerConfig: enabled: true diff --git a/argocd/charts/addons/external-dns/values.yaml b/argocd/charts/addons/external-dns/values.yaml index e69de29b..9f5f4c4c 100644 --- a/argocd/charts/addons/external-dns/values.yaml +++ b/argocd/charts/addons/external-dns/values.yaml @@ -0,0 +1 @@ +policy : "sync" # Allows to delete DNS records \ No newline at end of file diff --git a/argocd/charts/addons/ingress-nginx/values.yaml b/argocd/charts/addons/ingress-nginx/values.yaml index 7bc634ef..d7f67774 100644 --- a/argocd/charts/addons/ingress-nginx/values.yaml +++ b/argocd/charts/addons/ingress-nginx/values.yaml @@ -1,31 +1 @@ # Helm chart values -controller: - replicaCount: 3 - service: - #1. default is to create classic load balander - type: LoadBalancer - #2. Else you can uncomment below section to create a NLB to expose nginx - #type: LoadBalancer - # annotations: - # service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip - # service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing - # service.beta.kubernetes.io/aws-load-balancer-security-groups: '{{.metadata.annotations.aws_security_group_ingress_nginx}}' - # service.beta.kubernetes.io/aws-load-balancer-manage-backend-security-group-rules: true - # loadBalancerClass: service.k8s.aws/nlb - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: topology.kubernetes.io/zone - whenUnsatisfiable: ScheduleAnyway - labelSelector: - matchLabels: - app.kubernetes.io/instance: ingress-nginx - - maxSkew: 1 - topologyKey: kubernetes.io/hostname - whenUnsatisfiable: ScheduleAnyway - labelSelector: - matchLabels: - app.kubernetes.io/instance: ingress-nginx - minAvailable: 2 - ingressClassResource: - name: nginx - default: false From 48ea4c1240a115bfe6ec8ed867a03e149502d6f1 Mon Sep 17 00:00:00 2001 From: Carlos Santana Date: Thu, 21 Sep 2023 18:29:54 -0400 Subject: [PATCH 2/2] add nginx Signed-off-by: Carlos Santana --- ...s-aws-oss-crossplane-providers-appset.yaml | 2 +- argocd/charts/addons/external-dns/values.yaml | 3 +- .../charts/addons/ingress-nginx/values.yaml | 30 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-crossplane-providers-appset.yaml b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-crossplane-providers-appset.yaml index 4af3fbae..cad4d216 100644 --- a/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-crossplane-providers-appset.yaml +++ b/argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-crossplane-providers-appset.yaml @@ -61,4 +61,4 @@ spec: automated: {} syncOptions: - CreateNamespace=true - - ServerSideApply=true # Big CRDs. \ No newline at end of file + - ServerSideApply=true # Big CRDs. diff --git a/argocd/charts/addons/external-dns/values.yaml b/argocd/charts/addons/external-dns/values.yaml index 9f5f4c4c..bd1714f8 100644 --- a/argocd/charts/addons/external-dns/values.yaml +++ b/argocd/charts/addons/external-dns/values.yaml @@ -1 +1,2 @@ -policy : "sync" # Allows to delete DNS records \ No newline at end of file +# Helm chart values +policy : "sync" # Allows to delete DNS records diff --git a/argocd/charts/addons/ingress-nginx/values.yaml b/argocd/charts/addons/ingress-nginx/values.yaml index d7f67774..7bc634ef 100644 --- a/argocd/charts/addons/ingress-nginx/values.yaml +++ b/argocd/charts/addons/ingress-nginx/values.yaml @@ -1 +1,31 @@ # Helm chart values +controller: + replicaCount: 3 + service: + #1. default is to create classic load balander + type: LoadBalancer + #2. Else you can uncomment below section to create a NLB to expose nginx + #type: LoadBalancer + # annotations: + # service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip + # service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing + # service.beta.kubernetes.io/aws-load-balancer-security-groups: '{{.metadata.annotations.aws_security_group_ingress_nginx}}' + # service.beta.kubernetes.io/aws-load-balancer-manage-backend-security-group-rules: true + # loadBalancerClass: service.k8s.aws/nlb + topologySpreadConstraints: + - maxSkew: 1 + topologyKey: topology.kubernetes.io/zone + whenUnsatisfiable: ScheduleAnyway + labelSelector: + matchLabels: + app.kubernetes.io/instance: ingress-nginx + - maxSkew: 1 + topologyKey: kubernetes.io/hostname + whenUnsatisfiable: ScheduleAnyway + labelSelector: + matchLabels: + app.kubernetes.io/instance: ingress-nginx + minAvailable: 2 + ingressClassResource: + name: nginx + default: false