From 0eb121b8333ed7ea8f71b0725168f84eb536a607 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sat, 14 Oct 2023 21:57:00 -0500 Subject: [PATCH] kitchen: Remove config.yml ConfigMap generator The `config.yml` document for *kitchen* contains several "secret" values (e.g. passwords to Nextcloud, MQTT, etc.). We don't want to commit these to the Git repository, of course, but as long as Kustomize expects to find the `config.yml` file, we won't be able to manage the application with Argo CD. Ultimately, *kitchen* needs to be modified to be able to read secrets separately from config, but until then, we will have to avoid managing `config.yml` with Kustomize. --- kitchen/kitchen.yaml | 13 +------------ kitchen/kustomization.yaml | 7 ------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/kitchen/kitchen.yaml b/kitchen/kitchen.yaml index 104f701..6e30e59 100644 --- a/kitchen/kitchen.yaml +++ b/kitchen/kitchen.yaml @@ -4,18 +4,6 @@ kind: Namespace metadata: name: kitchen ---- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/name: kitchen - app.kubernetes.io/instance: kitchen - app.kubernetes.io/component: kitchen - app.kubernetes.io/part-of: kitchen - name: kitchen - namespace: kitchen - --- apiVersion: apps/v1 kind: Deployment @@ -66,6 +54,7 @@ spec: - name: config configMap: name: kitchen + optional: true - name: tzinfo hostPath: path: /usr/share/zoneinfo diff --git a/kitchen/kustomization.yaml b/kitchen/kustomization.yaml index 63aec31..9d81471 100644 --- a/kitchen/kustomization.yaml +++ b/kitchen/kustomization.yaml @@ -9,13 +9,6 @@ resources: - kitchen.yaml - secrets.yaml -configMapGenerator: -- name: kitchen - namespace: kitchen - behavior: merge - files: - - config.yaml - patches: - patch: |- apiVersion: apps/v1