Skip to content

Commit dad7113

Browse files
csantanaprcsantanapr
authored
Update 09 21 (#27)
* changes from upstream Signed-off-by: Carlos Santana <[email protected]> * fix corssplane Signed-off-by: Carlos Santana <[email protected]> --------- Signed-off-by: Carlos Santana <[email protected]>
1 parent 0f69309 commit dad7113

File tree

9 files changed

+123
-42
lines changed

9 files changed

+123
-42
lines changed

‎bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-hub-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ spec:
5353
releaseName: '{{.values.addonChart}}'
5454
ignoreMissingValueFiles: true
5555
valueFiles:
56-
- $values{{.metadata.annotations.addons_repo_basepath}}/charts/addons/{{.values.addonChart}}/values.yaml
57-
- $values{{.metadata.annotations.addons_repo_basepath}}/environments/{{.metadata.labels.environment}}/addons/{{.values.addonChart}}/values.yaml
58-
- $values{{.metadata.annotations.addons_repo_basepath}}/clusters/{{.name}}/addons/{{.values.addonChart}}/values.yaml
56+
- $values/{{.metadata.annotations.addons_repo_basepath}}charts/addons/{{.values.addonChart}}/values.yaml
57+
- $values/{{.metadata.annotations.addons_repo_basepath}}environments/{{.metadata.labels.environment}}/addons/{{.values.addonChart}}/values.yaml
58+
- $values/{{.metadata.annotations.addons_repo_basepath}}clusters/{{.name}}/addons/{{.values.addonChart}}/values.yaml
5959
values: |
6060
controller:
6161
serviceAccount:

‎bootstrap/control-plane/addons/aws/addons-aws-oss-argocd-ingress-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ spec:
5353
releaseName: '{{.values.addonChart}}'
5454
ignoreMissingValueFiles: true
5555
valueFiles:
56-
- $values{{.metadata.annotations.addons_repo_basepath}}/charts/addons/{{.values.addonChart}}/values.yaml
57-
- $values{{.metadata.annotations.addons_repo_basepath}}/environments/{{.metadata.labels.environment}}/addons/{{.values.addonChart}}/values.yaml
58-
- $values{{.metadata.annotations.addons_repo_basepath}}/clusters/{{.name}}/addons/{{.values.addonChart}}/values.yaml
56+
- $values/{{.metadata.annotations.addons_repo_basepath}}charts/addons/{{.values.addonChart}}/values.yaml
57+
- $values/{{.metadata.annotations.addons_repo_basepath}}environments/{{.metadata.labels.environment}}/addons/{{.values.addonChart}}/values.yaml
58+
- $values/{{.metadata.annotations.addons_repo_basepath}}clusters/{{.name}}/addons/{{.values.addonChart}}/values.yaml
5959
values: |
6060
controller:
6161
serviceAccount:

‎bootstrap/control-plane/addons/oss/addons-ingress-nginx-appset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ spec:
5353
releaseName: '{{.values.addonChart}}'
5454
ignoreMissingValueFiles: true
5555
valueFiles:
56-
- $values{{.metadata.annotations.addons_repo_basepath}}/charts/addons/{{.values.addonChart}}/values.yaml
57-
- $values{{.metadata.annotations.addons_repo_basepath}}/environments/{{.metadata.labels.environment}}/addons/{{.values.addonChart}}/values.yaml
58-
- $values{{.metadata.annotations.addons_repo_basepath}}/clusters/{{.name}}/addons/{{.values.addonChart}}/values.yaml
56+
- $values/{{.metadata.annotations.addons_repo_basepath}}charts/addons/{{.values.addonChart}}/values.yaml
57+
- $values/{{.metadata.annotations.addons_repo_basepath}}environments/{{.metadata.labels.environment}}/addons/{{.values.addonChart}}/values.yaml
58+
- $values/{{.metadata.annotations.addons_repo_basepath}}clusters/{{.name}}/addons/{{.values.addonChart}}/values.yaml
5959
values: |
6060
controller:
6161
service:

‎charts/addons/argo-cd/values.yaml

+33-31
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ controller:
66
annotations:
77
prometheus.io/scrape: true
88
env:
9-
- name: ARGOCD_K8S_CLIENT_QPS #required for Crossplane too many CRDs https://github.com/argoproj/argo-cd/pull/448
10-
value: "300"
9+
- name: ARGOCD_K8S_CLIENT_QPS #required for Crossplane too many CRDs https://github.com/argoproj/argo-cd/pull/448
10+
value: '300'
1111

1212
repoServer:
1313
autoscaling:
1414
enabled: true
1515
minReplicas: 1
1616
resources: # Adjust based on your specific use case (required for HPA)
1717
requests:
18-
cpu : "100m"
19-
memory : "256Mi"
18+
cpu: '100m'
19+
memory: '256Mi'
2020
limits:
21-
cpu: "200m"
22-
memory: "512Mi"
21+
cpu: '200m'
22+
memory: '512Mi'
2323
metrics:
2424
enabled: true
2525
service:
@@ -40,18 +40,21 @@ server:
4040
minReplicas: 1
4141
resources: # Adjust based on your specific use case (required for HPA)
4242
requests:
43-
cpu : "100m"
44-
memory : "256Mi"
43+
cpu: '100m'
44+
memory: '256Mi'
4545
limits:
46-
cpu: "200m"
47-
memory: "512Mi"
46+
cpu: '200m'
47+
memory: '512Mi'
4848
metrics:
4949
enabled: true
5050
service:
5151
annotations:
5252
prometheus.io/scrape: true
5353
service:
5454
type: LoadBalancer
55+
annotations:
56+
service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip
57+
service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
5558

5659
configs:
5760
repositories:
@@ -60,9 +63,9 @@ configs:
6063
name: aws-public-ecr
6164
type: helm
6265
url: public.ecr.aws
63-
enableOCI: "true"
66+
enableOCI: 'true'
6467
cm:
65-
application.resourceTrackingMethod: "annotation" #use annotation for tracking required for Crossplane
68+
application.resourceTrackingMethod: 'annotation' #use annotation for tracking required for Crossplane
6669
resource.exclusions: |
6770
- kinds:
6871
- ProviderConfigUsage
@@ -186,7 +189,6 @@ configs:
186189
187190
return health_status
188191
189-
190192
# -- Array of extra K8s manifests to deploy
191193
## Note: Supports use of custom Helm templates
192194
## It gets handle in this form inside the argo-cd chart
@@ -199,21 +201,21 @@ configs:
199201
# {{- end }}
200202
# {{ end }}
201203
extraObjects:
202-
- |
203-
apiVersion: argoproj.io/v1alpha1
204-
kind: AppProject
205-
metadata:
206-
name: default
207-
namespace: {{ $.Release.Namespace | quote }}
208-
annotations:
209-
source: gitops-brige
210-
spec:
211-
clusterResourceWhitelist:
212-
- group: '*'
213-
kind: '*'
214-
sourceRepos:
215-
- '*'
216-
destinations:
217-
- namespace: '*'
218-
name: '*'
219-
server: '*'
204+
- |
205+
apiVersion: argoproj.io/v1alpha1
206+
kind: AppProject
207+
metadata:
208+
name: default
209+
namespace: {{ $.Release.Namespace | quote }}
210+
annotations:
211+
source: gitops-brige
212+
spec:
213+
clusterResourceWhitelist:
214+
- group: '*'
215+
kind: '*'
216+
sourceRepos:
217+
- '*'
218+
destinations:
219+
- namespace: '*'
220+
name: '*'
221+
server: '*'

‎charts/addons/crossplane/resources/aws-upbound/templates/provider-config.yaml

+24
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,28 @@ metadata:
2020
spec:
2121
{{- .spec | toYaml | nindent 2 }}
2222
{{- end }}
23+
24+
---
25+
{{- with .Values.providerConfig }}
26+
apiVersion: aws.upbound.io/v1beta1
27+
kind: ProviderConfig
28+
metadata:
29+
name: default
30+
annotations:
31+
argocd.argoproj.io/sync-wave: "4"
32+
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
33+
{{- range $key, $value := .metadata.annotations }}
34+
{{ $key }}: {{ $value | quote }}
35+
{{- end }}
36+
37+
{{- if .metadata.labels }}
38+
labels:
39+
{{- range $key, $value := .metadata.labels }}
40+
{{ $key }}: {{ $value | quote }}
41+
{{- end }}
42+
{{- end }}
43+
spec:
44+
{{- .spec | toYaml | nindent 2 }}
45+
{{- end }}
46+
2347
{{- end }}

‎charts/addons/crossplane/resources/aws/templates/provider-config.yaml

+24
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,28 @@ metadata:
2020
spec:
2121
{{- .spec | toYaml | nindent 2 }}
2222
{{- end }}
23+
24+
---
25+
{{- with .Values.providerConfig }}
26+
apiVersion: aws.crossplane.io/v1beta1
27+
kind: ProviderConfig
28+
metadata:
29+
name: default
30+
annotations:
31+
argocd.argoproj.io/sync-wave: "3"
32+
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
33+
{{- range $key, $value := .metadata.annotations }}
34+
{{ $key }}: {{ $value | quote }}
35+
{{- end }}
36+
37+
{{- if .metadata.labels }}
38+
labels:
39+
{{- range $key, $value := .metadata.labels }}
40+
{{ $key }}: {{ $value | quote }}
41+
{{- end }}
42+
{{- end }}
43+
spec:
44+
{{- .spec | toYaml | nindent 2 }}
45+
{{- end }}
46+
2347
{{- end }}

‎charts/addons/crossplane/resources/aws/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ controllerConfig:
1717
provider:
1818
enabled: true
1919
metadata:
20-
name: "aws-provider"
20+
name: "provider-aws"
2121
iam_role_arn: null
2222
annotations: {}
2323
labels: {}

‎charts/addons/external-dns/values.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
policy : "sync" # Allows to delete DNS records
1+
# Helm chart values
2+
policy : "sync" # Allows to delete DNS records

‎charts/addons/ingress-nginx/values.yaml

+30
Original file line numberDiff line numberDiff line change
@@ -1 +1,31 @@
11
# Helm chart values
2+
controller:
3+
replicaCount: 3
4+
service:
5+
#1. default is to create classic load balander
6+
type: LoadBalancer
7+
#2. Else you can uncomment below section to create a NLB to expose nginx
8+
#type: LoadBalancer
9+
# annotations:
10+
# service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: ip
11+
# service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
12+
# service.beta.kubernetes.io/aws-load-balancer-security-groups: '{{.metadata.annotations.aws_security_group_ingress_nginx}}'
13+
# service.beta.kubernetes.io/aws-load-balancer-manage-backend-security-group-rules: true
14+
# loadBalancerClass: service.k8s.aws/nlb
15+
topologySpreadConstraints:
16+
- maxSkew: 1
17+
topologyKey: topology.kubernetes.io/zone
18+
whenUnsatisfiable: ScheduleAnyway
19+
labelSelector:
20+
matchLabels:
21+
app.kubernetes.io/instance: ingress-nginx
22+
- maxSkew: 1
23+
topologyKey: kubernetes.io/hostname
24+
whenUnsatisfiable: ScheduleAnyway
25+
labelSelector:
26+
matchLabels:
27+
app.kubernetes.io/instance: ingress-nginx
28+
minAvailable: 2
29+
ingressClassResource:
30+
name: nginx
31+
default: false

0 commit comments

Comments
 (0)