Skip to content

Commit

Permalink
trimming trailing whitespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
iamprakkie committed Sep 27, 2023
1 parent 1d83b84 commit d758083
Show file tree
Hide file tree
Showing 29 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion artifacts/sample-apps/envs/dev/templates/team-riker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: team-riker
namespace: {{ .Values.argoNamespace | default "argocd" }}
labels: |
{{- toYaml .Values.labels | nindent 4 }}
{{- toYaml .Values.labels | nindent 4 }}
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion artifacts/sample-apps/envs/prod/templates/team-riker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: team-riker
namespace: {{ .Values.argoNamespace | default "argocd" }}
labels:
{{- toYaml .Values.labels | nindent 4 }}
{{- toYaml .Values.labels | nindent 4 }}
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion artifacts/sample-apps/envs/test/templates/team-riker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: team-riker
namespace: {{ .Values.argoNamespace | default "argocd" }}
labels: |
{{- toYaml .Values.labels | nindent 4 }}
{{- toYaml .Values.labels | nindent 4 }}
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
namespace: argocd
labels:
app: argocd
{{- toYaml .Values.labels | nindent 4 }}
{{- toYaml .Values.labels | nindent 4 }}
annotations:
{{ if eq .Values.spec.ingress.type "nginx" }}
#nginx annotations
Expand All @@ -28,11 +28,11 @@ metadata:
alb.ingress.kubernetes.io/tags: Environment={{ .Values.labels.env }},Team=Burnham
{{ end }}
link.argocd.argoproj.io/external-link: 'https://console.aws.amazon.com/cloudwatch/home?#container-insights:performance'
{{ if .Values.spec.ingress.host }}
{{ if .Values.spec.ingress.host }}
external-dns.alpha.kubernetes.io/set-identifier: {{ .Values.spec.clusterName }}
external-dns.alpha.kubernetes.io/aws-weight: '{{ .Values.spec.ingress.argocd_route53_weight }}'
external-dns.alpha.kubernetes.io/ttl: "10"
{{ end }}
{{ end }}
spec:
{{ if eq .Values.spec.ingress.type "nginx" }}
kubernetes.io/ingress.class: "nginx"
Expand All @@ -44,7 +44,7 @@ spec:
- host: argocd.{{ .Values.spec.ingress.host }}
{{ else }}
- host:
{{ end }}
{{ end }}
http:
paths:
- path: /
Expand Down
4 changes: 2 additions & 2 deletions artifacts/teams/team-burnham/dev/templates/burnham.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
external-dns.alpha.kubernetes.io/set-identifier: {{ .Values.spec.clusterName }}
external-dns.alpha.kubernetes.io/aws-weight: '{{ .Values.spec.ingress.route53_weight }}'
external-dns.alpha.kubernetes.io/ttl: "10"
{{ end }}
{{ end }}
spec:
{{ if eq .Values.spec.ingress.type "nginx" }}
kubernetes.io/ingress.class: "nginx"
Expand Down Expand Up @@ -53,7 +53,7 @@ kind: Service
metadata:
name: burnham
labels:
app: burnham-ingress-{{ .Values.spec.env }}
app: burnham-ingress-{{ .Values.spec.env }}
spec:
ports:
- port: 80
Expand Down
2 changes: 1 addition & 1 deletion artifacts/teams/team-burnham/dev/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
name: nginx
labels:
app: burnham
app: burnham
{{- toYaml .Values.labels | nindent 4 }}
spec:
replicas: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ kind: AWSNodeTemplate
metadata:
name: karpenter-default
labels:
{{- toYaml .Values.labels | nindent 4 }}
{{- toYaml .Values.labels | nindent 4 }}
spec:
#amiFamily: Bottlerocket
#instanceProfile: '{{ .Values.spec.karpenterInstanceProfile }}'
Expand All @@ -62,7 +62,7 @@ kind: Provisioner
metadata:
name: burnham
labels:
{{- toYaml .Values.labels | nindent 4 }}
{{- toYaml .Values.labels | nindent 4 }}
spec:
requirements:
# - key: 'node.kubernetes.io/instance-type'
Expand Down Expand Up @@ -118,7 +118,7 @@ spec:
- key: karpenter.k8s.aws/instance-cpu
operator: Lt
values:
- '33'
- '33'
- key: 'kubernetes.io/arch'
operator: In
values: ['amd64']
Expand Down
16 changes: 8 additions & 8 deletions artifacts/teams/team-burnham/dev/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
name: nginx
labels:
{{- toYaml .Values.labels | nindent 4 }}
spec:
ports:
- port: 80
targetPort: 80
selector:
spec:
ports:
- port: 80
targetPort: 80
selector:
app: nginx
4 changes: 2 additions & 2 deletions artifacts/teams/team-burnham/prod/templates/burnham.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
external-dns.alpha.kubernetes.io/set-identifier: {{ .Values.spec.clusterName }}
external-dns.alpha.kubernetes.io/aws-weight: '{{ .Values.spec.ingress.route53_weight }}'
external-dns.alpha.kubernetes.io/ttl: "10"
{{ end }}
{{ end }}
spec:
{{ if eq .Values.spec.ingress.type "nginx" }}
kubernetes.io/ingress.class: "nginx"
Expand Down Expand Up @@ -53,7 +53,7 @@ kind: Service
metadata:
name: burnham
labels:
app: burnham-ingress-{{ .Values.spec.env }}
app: burnham-ingress-{{ .Values.spec.env }}
spec:
ports:
- port: 80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
name: nginx
labels:
app: burnham
app: burnham
{{- toYaml .Values.labels | nindent 4 }}
spec:
replicas: 1
Expand Down
16 changes: 8 additions & 8 deletions artifacts/teams/team-burnham/prod/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
name: nginx
labels:
{{- toYaml .Values.labels | nindent 4 }}
spec:
ports:
- port: 80
targetPort: 80
selector:
spec:
ports:
- port: 80
targetPort: 80
selector:
app: nginx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
name: nginx
labels:
app: burnham
app: burnham
{{- toYaml .Values.labels | nindent 4 }}
spec:
replicas: 1
Expand Down
16 changes: 8 additions & 8 deletions artifacts/teams/team-burnham/test/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
name: nginx
labels:
{{- toYaml .Values.labels | nindent 4 }}
spec:
ports:
- port: 80
targetPort: 80
selector:
spec:
ports:
- port: 80
targetPort: 80
selector:
app: nginx
4 changes: 2 additions & 2 deletions artifacts/teams/team-geordie/dev/ho11y/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
external-dns.alpha.kubernetes.io/set-identifier: {{ .Values.spec.clusterName }}
external-dns.alpha.kubernetes.io/aws-weight: '{{ .Values.spec.ingress.route53_weight }}'
external-dns.alpha.kubernetes.io/ttl: "10"
{{ end }}
{{ end }}
spec:
{{ if eq .Values.spec.ingress.type "nginx" }}
ingressClassName: nginx
Expand All @@ -45,5 +45,5 @@ spec:
backend:
service:
name: frontend
port:
port:
number: 80
4 changes: 2 additions & 2 deletions artifacts/teams/team-geordie/dev/yelb/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
external-dns.alpha.kubernetes.io/set-identifier: {{ .Values.spec.clusterName }}
external-dns.alpha.kubernetes.io/aws-weight: '{{ .Values.spec.ingress.route53_weight }}'
external-dns.alpha.kubernetes.io/ttl: "10"
{{ end }}
{{ end }}
labels:
app: yelb-ui
spec:
Expand All @@ -47,5 +47,5 @@ spec:
backend:
service:
name: yelb-ui
port:
port:
number: 80
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
external-dns.alpha.kubernetes.io/set-identifier: {{ .Values.spec.clusterName }}
external-dns.alpha.kubernetes.io/aws-weight: '{{ .Values.spec.ingress.route53_weight }}'
external-dns.alpha.kubernetes.io/ttl: "10"
{{ end }}
{{ end }}
spec:
{{ if eq .Values.spec.ingress.type "nginx" }}
ingressClassName: nginx
Expand All @@ -45,5 +45,5 @@ spec:
backend:
service:
name: frontend
port:
port:
number: 80
4 changes: 2 additions & 2 deletions artifacts/teams/team-geordie/prod/templates/ho11y-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: ho11y
# namespace is specified as namespace destination in env/{dev,test,prod}/team-geordie.yaml
# namespace is specified as namespace destination in env/{dev,test,prod}/team-geordie.yaml
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
Expand All @@ -18,7 +18,7 @@ spec:
values: |
{{- toYaml .Values | nindent 8 }}
syncPolicy:
automated:
automated:
prune: true
syncOptions:
- CreateNamespace=true
4 changes: 2 additions & 2 deletions artifacts/teams/team-geordie/prod/yelb/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
external-dns.alpha.kubernetes.io/set-identifier: {{ .Values.spec.clusterName }}
external-dns.alpha.kubernetes.io/aws-weight: '{{ .Values.spec.ingress.route53_weight }}'
external-dns.alpha.kubernetes.io/ttl: "10"
{{ end }}
{{ end }}
labels:
app: yelb-ui
spec:
Expand All @@ -47,5 +47,5 @@ spec:
backend:
service:
name: yelb-ui
port:
port:
number: 80
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
external-dns.alpha.kubernetes.io/set-identifier: {{ .Values.spec.clusterName }}
external-dns.alpha.kubernetes.io/aws-weight: '{{ .Values.spec.ingress.route53_weight }}'
external-dns.alpha.kubernetes.io/ttl: "10"
{{ end }}
{{ end }}
spec:
{{ if eq .Values.spec.ingress.type "nginx" }}
ingressClassName: nginx
Expand All @@ -45,5 +45,5 @@ spec:
backend:
service:
name: frontend
port:
port:
number: 80
4 changes: 2 additions & 2 deletions artifacts/teams/team-geordie/test/yelb/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ metadata:
external-dns.alpha.kubernetes.io/set-identifier: {{ .Values.spec.clusterName }}
external-dns.alpha.kubernetes.io/aws-weight: '{{ .Values.spec.ingress.route53_weight }}'
external-dns.alpha.kubernetes.io/ttl: "10"
{{ end }}
{{ end }}
labels:
app: yelb-ui
spec:
Expand All @@ -47,5 +47,5 @@ spec:
backend:
service:
name: yelb-ui
port:
port:
number: 80
8 changes: 4 additions & 4 deletions artifacts/teams/team-kirk/dev/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
kubernetes.io/ingress.class: alb
alb.ingress.kubernetes.io/scheme: internet-facing
alb.ingress.kubernetes.io/tags: Environment=dev,Project=cognito
external-dns.alpha.kubernetes.io/hostname: {{ .Values.spec.ingress.host }}
external-dns.alpha.kubernetes.io/hostname: {{ .Values.spec.ingress.host }}
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
alb.ingress.kubernetes.io/ssl-redirect: '443'
alb.ingress.kubernetes.io/auth-type: cognito
Expand All @@ -26,14 +26,14 @@ spec:
{{ if .Values.spec.ingress.host }}
- host: {{ .Values.spec.ingress.host }}
{{ else }}
- host:
{{ end }}
- host:
{{ end }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: kubecost-cost-analyzer-cost-analyzer
port:
port:
number: 9090
2 changes: 1 addition & 1 deletion artifacts/teams/team-kirk/dev/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ spec:
cognitoUserPoolArn:
cognitoUserPoolAppId:
cognitoDomainName:
certificateArn:
certificateArn:
region:
type: alb
8 changes: 4 additions & 4 deletions artifacts/teams/team-kirk/prod/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
kubernetes.io/ingress.class: alb
alb.ingress.kubernetes.io/scheme: internet-facing
alb.ingress.kubernetes.io/tags: Environment=Prod,Project=cognito
external-dns.alpha.kubernetes.io/hostname: {{ .Values.spec.ingress.host }}
external-dns.alpha.kubernetes.io/hostname: {{ .Values.spec.ingress.host }}
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
alb.ingress.kubernetes.io/auth-type: cognito
Expand All @@ -25,14 +25,14 @@ spec:
{{ if .Values.spec.ingress.host }}
- host: {{ .Values.spec.ingress.host }}
{{ else }}
- host:
{{ end }}
- host:
{{ end }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: kubecost-cost-analyzer-cost-analyzer
port:
port:
number: 9090
Loading

0 comments on commit d758083

Please sign in to comment.