Skip to content

Update 09 21 #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update 09 21 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d771f0
update gitops-bridge addons 2023-09-21
csantanapr Sep 21, 2023
48ea4c1
add nginx
csantanapr Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions argocd/bootstrap/control-plane/addons/aws/addons-aws-csi-ebs-resources-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why you bring back local path ?

- ../../../../clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml
# values:
# fileParameters:
# - name:
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/aws/addons-aws-fluentbit-fargate-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

- ../../../../clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml
values: |
region: {{metadata.annotations.aws_region}}
log_group_name: {{metadata.annotations.fargate_fluentbit_log_group_name}}
Expand All @@ -50,4 +50,4 @@ spec:
automated: {}
syncOptions:
- CreateNamespace=true
- ServerSideApply=true # Big CRDs.
- ServerSideApply=true # Big CRDs.
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/aws/addons-aws-load-balancer-controller-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-hub-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
8 changes: 4 additions & 4 deletions argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-ingress-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down Expand Up @@ -92,4 +92,4 @@ spec:
automated: {}
syncOptions:
- CreateNamespace=true
- ServerSideApply=true # Big CRDs.
- ServerSideApply=true # Big CRDs.
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-cert-manager-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-crossplane-providers-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same ?

- ../../../../clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml
values: |
global:
enabled_aws: {{metadata.labels.enable_aws_crossplane_provider}}
Expand Down Expand Up @@ -61,4 +61,4 @@ spec:
automated: {}
syncOptions:
- CreateNamespace=true
- ServerSideApply=true # Big CRDs.
- ServerSideApply=true # Big CRDs.
8 changes: 4 additions & 4 deletions argocd/bootstrap/control-plane/addons/aws/addons-aws-oss-external-dns-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}'
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/oss/addons-argo-cd-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/oss/addons-argo-events-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/oss/addons-argo-rollouts-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/oss/addons-argo-workflows-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/oss/addons-cert-manager-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/oss/addons-ingress-nginx-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
6 changes: 3 additions & 3 deletions argocd/bootstrap/control-plane/addons/oss/addons-kube-prometheus-stack-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
4 changes: 2 additions & 2 deletions argocd/bootstrap/control-plane/addons/oss/addons-kyverno-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

- ../../../../clusters/{{name}}/addons/{{values.addonChart}}/resources/values.yaml
# values:
# fileParameters:
# - name:
Expand Down
Loading