From cad68e1eccee7487813f7051385aa49427c551f1 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sat, 26 Nov 2022 13:51:36 +0100
Subject: [PATCH] fix config
---
roles/k8s_master/files/custom/teckids-apiserver.yaml | 10 ----------
roles/k8s_master/templates/teckids-apiserver.yaml.j2 | 2 ++
2 files changed, 2 insertions(+), 10 deletions(-)
delete mode 100644 roles/k8s_master/files/custom/teckids-apiserver.yaml
diff --git a/roles/k8s_master/files/custom/teckids-apiserver.yaml b/roles/k8s_master/files/custom/teckids-apiserver.yaml
deleted file mode 100644
index 7b00d42..0000000
--- a/roles/k8s_master/files/custom/teckids-apiserver.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: kubeadm.k8s.io/v1beta3
-kind: ClusterConfiguration
-kubernetesVersion: v1.23.5
-apiServer:
- extraArgs:
- oidc-issuer-url: "https://ticdesk.teckids.org/oauth"
- oidc-client-id: "RcO3weOpSnlenZcBaBbXKFoNpElQzxjU0O20T273"
- oidc-username-claim: "preferred_username"
- audit-log-path: "/var/log/audit.log"
- audit-policy-file: "/etc/kubernetes/manifests/custom/teckids-logging.yaml"
diff --git a/roles/k8s_master/templates/teckids-apiserver.yaml.j2 b/roles/k8s_master/templates/teckids-apiserver.yaml.j2
index ee511a1..224bae7 100644
--- a/roles/k8s_master/templates/teckids-apiserver.yaml.j2
+++ b/roles/k8s_master/templates/teckids-apiserver.yaml.j2
@@ -6,3 +6,5 @@ apiServer:
oidc-issuer-url: "https://ticdesk.teckids.org/oauth"
oidc-client-id: "{{ kubernetes_oidc_id }}"
oidc-username-claim: "preferred_username"
+ audit-log-path: "/var/log/audit.log"
+ audit-policy-file: "/etc/kubernetes/manifests/custom/teckids-logging.yaml"
--
GitLab