Skip to content
This repository was archived by the owner on Jun 12, 2024. It is now read-only.

Commit cc98a7d

Browse files
committed
Improve oauth2
1 parent cf1a8c1 commit cc98a7d

File tree

13 files changed

+47
-23
lines changed

13 files changed

+47
-23
lines changed

.github/workflows/clusters-aws-reusable-workflow.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,13 @@ jobs:
184184
185185
export KUBECONFIG="/tmp/kubeconfig-${CLUSTER_NAME}.conf"
186186
if aws eks update-kubeconfig --name "${CLUSTER_NAME}" --kubeconfig "${KUBECONFIG}" ; then
187-
kubectl patch kustomization -n flux-system external-dns ingress-nginx cert-manager-certificate --type='json' -p='[{"op": "add", "path": "/spec/suspend", "value":true}]'
188-
kubectl delete certificate -n cert-manager --all || true
189-
kubectl delete deployments -n external-dns -l app.kubernetes.io/name=external-dns || true
190-
kubectl delete service -n ingress-nginx -l app.kubernetes.io/component=controller || true
191-
kubectl delete secrets.secretsmanager.aws.crossplane.io -n crossplane-system secretsmanager-kuard-secret || true
187+
(
188+
kubectl patch kustomization -n flux-system external-dns ingress-nginx cert-manager-certificate --type='json' -p='[{"op": "add", "path": "/spec/suspend", "value":true}]'
189+
kubectl delete certificate -n cert-manager --all
190+
kubectl delete deployments -n external-dns -l app.kubernetes.io/name=external-dns
191+
kubectl delete service -n ingress-nginx -l app.kubernetes.io/component=controller
192+
kubectl delete secrets.secretsmanager.aws.crossplane.io -n crossplane-system secretsmanager-kuard-secret
193+
) || true
192194
rm "${KUBECONFIG}"
193195
fi
194196

clusters/aws-dev-mgmt/flux/cluster-apps-secrets/cluster-apps-secrets.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ data:
1818
GOOGLE_CLIENT_SECRET: ENC[AES256_GCM,data:tYvGtANnxyj0Ek+rYx3062uMzKy7wYbgD1PB2zq5cqEPGdJBHvIPIsfvDdeAf849,iv:pr2tMxzcMVX33SMey7C5GX22OCfOfCofKoobpLFedlI=,tag:v7QurU2gfDOP2ctVDmxK+w==,type:str]
1919
KEYCLOAK_ADMIN_USERNAME: ENC[AES256_GCM,data:E2aV6AcQxNg=,iv:mtqtHWEFh+Z8fsSY9bHHSyJwjBmSyviaUN94JhkoR7M=,tag:n5qNcaT2eva0CH2PEGtcxg==,type:str]
2020
KEYCLOAK_ADMIN_PASSWORD: ENC[AES256_GCM,data:lw7IwY0fANGD/2iYeGZmACkbM3TMsDaXjUYpasceTKIGLYGaamKPdw==,iv:YATGDhh5K9LiWQ2Dg81dIEoDUspknKJapYafuNhOQgo=,tag:86GbwBQF6Z7O51X7vDrhfA==,type:str]
21+
KUBERNETES_DASHBOARD_TOKEN: ENC[AES256_GCM,data:/BHmNYpEaX8=,iv:GWZwhILYDnNgqetdAd1LZnEU1nKd8/mZMhdmgvtnHpw=,tag:EV3QwKM9q2JU0kT+Tm7P9Q==,type:str]
2122
sops:
2223
kms:
2324
- arn: arn:aws:kms:eu-central-1:729560437327:alias/sops
@@ -28,8 +29,8 @@ sops:
2829
azure_kv: []
2930
hc_vault: []
3031
age: []
31-
lastmodified: "2022-08-27T04:28:54Z"
32-
mac: ENC[AES256_GCM,data:V7oS8u9p0MzzwdMovoQhzcZh+uMt8Wy/86CQmPFD8R69gWUqjvZUVvTVR/GlEUO6rvfrwDjGTsMItVe+KRFQPPTiwlLXODaFfg+9/ctrjVLsVMPEwgd0SLdNOdFjhUR08CWqz48EB37RFy7tknEhYwwZmejy50mZ42+C9E3IMXQ=,iv:IbzeBWqiv3gy/ikXclPnZzLKVx410yh3Ue50ZNsn7CU=,tag:haQTvMSOD1hl0kFedRSL+Q==,type:str]
32+
lastmodified: "2022-09-02T14:42:01Z"
33+
mac: ENC[AES256_GCM,data:BCIOeAxK5+2n4jzjwpWbwf2LpBhVhf+PelDFmrmCFdEQQWaY8PiuKl5h3swa1eluym0jAeyDqIDSg/cpYSzdYEPl8WADzj7EaSuu9EbKwIwB4dNfMA6V1nrVf6XuW0BmvwzJY+MwlthINVoeQVq492ti6eEjhz2InOxFJYsckw4=,iv:EszJ1bmQ3PEt06I7wuWwhu7x9e/EUu6UoNtDFi5OA8E=,tag:Vslksfg42bqfjYPBpXMHGQ==,type:str]
3334
pgp:
3435
- created_at: "2022-07-07T06:23:23Z"
3536
enc: |-

clusters/aws-dev-mgmt/flux/cluster-apps/kubernetes-dashboard/kubernetes-dashboard-clusterrolebinding.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ roleRef:
99
subjects:
1010
- kind: ServiceAccount
1111
name: kubernetes-dashboard-admin
12-
namespace: kube-system
12+
namespace: kubernetes-dashboard
13+
1314
---
1415
apiVersion: v1
1516
kind: ServiceAccount
1617
metadata:
1718
name: kubernetes-dashboard-admin
18-
namespace: kube-system
19+
namespace: kubernetes-dashboard
20+
secrets:
21+
- name: kubernetes-dashboard-admin-token-secret

clusters/aws-dev-mgmt/flux/cluster-apps/kubernetes-dashboard/kubernetes-dashboard-group-helmrelease-values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ ingress:
1212
forecastle.stakater.com/appName: Kubernetes Dashboard
1313
nginx.ingress.kubernetes.io/auth-url: https://oauth2-proxy.${CLUSTER_FQDN}/oauth2/auth
1414
nginx.ingress.kubernetes.io/auth-signin: https://oauth2-proxy.${CLUSTER_FQDN}/oauth2/start?rd=$scheme://$host$request_uri
15+
nginx.ingress.kubernetes.io/auth-snippet: |
16+
proxy_set_header Authorization "Bearer ${KUBERNETES_DASHBOARD_TOKEN}";
17+
proxy_pass_header Authorization;
1518
className: nginx
1619
hosts:
1720
- kubernetes-dashboard.${CLUSTER_FQDN}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: v1
2+
kind: Secret
3+
metadata:
4+
name: kubernetes-dashboard-admin-token
5+
namespace: kubernetes-dashboard
6+
annotations:
7+
kubernetes.io/service-account.name: kubernetes-dashboard-admin
8+
type: kubernetes.io/service-account-token

clusters/aws-dev-mgmt/flux/cluster-apps/kubernetes-dashboard/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
44
- kubernetes-dashboard-clusterrolebinding.yaml
5+
- kubernetes-dashboard-token-secret.yaml
56

67
generatorOptions:
78
disableNameSuffixHash: true

clusters/aws-dev-mgmt/flux/cluster-apps/podinfo/podinfo-group-helmrelease-values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ingress:
1212
nginx.ingress.kubernetes.io/configuration-snippet: |
1313
auth_request_set $email $upstream_http_x_auth_request_email;
1414
proxy_set_header X-Email $email;
15+
proxy_set_header Authorization "Bearer ${KUBERNETES_DASHBOARD_TOKEN}";
16+
proxy_pass_header Authorization;
1517
className: nginx
1618
hosts:
1719
- host: podinfo.${CLUSTER_FQDN}

clusters/aws-dev-mgmt/mgmt01.k8s.use1.dev.proj.aws.mylabs.dev/flux/cluster-apps-kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ spec:
2525
name: cluster-apps-secrets
2626
- kind: Secret
2727
name: cluster-apps-group-secrets
28+
decryption:
29+
provider: sops

clusters/aws-dev-mgmt/mgmt01.k8s.use1.dev.proj.aws.mylabs.dev/flux/flux-system/gotk-sync.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
spec:
77
interval: 1m0s
88
ref:
9-
branch: main
9+
branch: improve-oauth2
1010
secretRef:
1111
name: flux-system
1212
url: ssh://[email protected]/ruzickap/k8s-tf-eks-gitops.git

clusters/aws-dev-mgmt/mgmt02.k8s.use1.dev.proj.aws.mylabs.dev/flux/cluster-apps-kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ spec:
2525
name: cluster-apps-secrets
2626
- kind: Secret
2727
name: cluster-apps-group-secrets
28+
decryption:
29+
provider: sops

0 commit comments

Comments
 (0)