From 49d2740813a6e70c72bf17a991e9aa4a2562059e Mon Sep 17 00:00:00 2001 From: Finn Date: Mon, 26 Aug 2024 22:52:28 -0700 Subject: [PATCH] Fix helm stuff --- helm/external-secrets/kustomization.yaml | 2 +- helm/openbao/kustomization.yaml | 20 +++++++++ helm/render-all.sh | 10 +++-- k8s/operators/external-secrets/bundle.yaml | 48 +++++++++++----------- 4 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 helm/openbao/kustomization.yaml diff --git a/helm/external-secrets/kustomization.yaml b/helm/external-secrets/kustomization.yaml index 417c945..598c950 100644 --- a/helm/external-secrets/kustomization.yaml +++ b/helm/external-secrets/kustomization.yaml @@ -3,9 +3,9 @@ kind: Kustomization helmCharts: - name: external-secrets valuesInline: - fullnameOverride: external-secrets # otherwise all resource names are inexplicably prefixed with "release-name-" bitwarden-sdk-server: enabled: false # default, bitwarden-sdk-server doesn't work with vaultwarden (https://github.com/external-secrets/bitwarden-sdk-server/issues/18) namespace: external-secrets + releaseName: external-secrets version: v0.10.0 repo: https://charts.external-secrets.io diff --git a/helm/openbao/kustomization.yaml b/helm/openbao/kustomization.yaml new file mode 100644 index 0000000..33ce5ae --- /dev/null +++ b/helm/openbao/kustomization.yaml @@ -0,0 +1,20 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: openbao +helmCharts: +- name: openbao + valuesInline: + fullnameOverride: openbao + global: + namespace: openbao + injector: + enabled: false + server: + ha: + enabled: true + repliacas: 3 + raft: + enabled: true + releaseName: openbao + version: 0.4.0 + repo: https://openbao.github.io/openbao-helm diff --git a/helm/render-all.sh b/helm/render-all.sh index 6628e7d..84ac17e 100755 --- a/helm/render-all.sh +++ b/helm/render-all.sh @@ -1,9 +1,11 @@ #!/bin/bash -# Usage: from the git root directory (../ relative to this file) -# podman run -v $(pwd):/repo --workdir /repo/helm nixery.dev/shell/kubectl/kubernetes-helm sh -c ./render-all.sh set -exuo pipefail header="# DO NOT EDIT: This file has been automatically generated by the script in helm/render-all.sh, edits may get overwritten" -echo "${header}" > ../k8s/operators/external-secrets/bundle.yaml -kubectl kustomize --enable-helm external-secrets/ >> ../k8s/operators/external-secrets/bundle.yaml +# operators +for component in openbao external-secrets; do + echo "${header}" > ../k8s/operators/${component}/bundle.yaml + kubectl kustomize --enable-helm ${component}/ >> ../k8s/operators/${component}/bundle.yaml +done + diff --git a/k8s/operators/external-secrets/bundle.yaml b/k8s/operators/external-secrets/bundle.yaml index cc5a89b..1d13f3c 100644 --- a/k8s/operators/external-secrets/bundle.yaml +++ b/k8s/operators/external-secrets/bundle.yaml @@ -13166,7 +13166,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13178,7 +13178,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-cert-controller app.kubernetes.io/version: v0.10.0 @@ -13190,7 +13190,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-webhook app.kubernetes.io/version: v0.10.0 @@ -13202,7 +13202,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13240,7 +13240,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-cert-controller app.kubernetes.io/version: v0.10.0 @@ -13306,7 +13306,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13417,7 +13417,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13461,7 +13461,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13482,7 +13482,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13523,7 +13523,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13543,7 +13543,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-cert-controller app.kubernetes.io/version: v0.10.0 @@ -13562,7 +13562,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13581,7 +13581,7 @@ apiVersion: v1 kind: Secret metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-webhook app.kubernetes.io/version: v0.10.0 @@ -13594,7 +13594,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-webhook app.kubernetes.io/version: v0.10.0 @@ -13609,7 +13609,7 @@ spec: protocol: TCP targetPort: 10250 selector: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/name: external-secrets-webhook type: ClusterIP --- @@ -13617,7 +13617,7 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13629,12 +13629,12 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/name: external-secrets template: metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets app.kubernetes.io/version: v0.10.0 @@ -13672,7 +13672,7 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-cert-controller app.kubernetes.io/version: v0.10.0 @@ -13684,12 +13684,12 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/name: external-secrets-cert-controller template: metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-cert-controller app.kubernetes.io/version: v0.10.0 @@ -13739,7 +13739,7 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-webhook app.kubernetes.io/version: v0.10.0 @@ -13751,12 +13751,12 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/name: external-secrets-webhook template: metadata: labels: - app.kubernetes.io/instance: release-name + app.kubernetes.io/instance: external-secrets app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: external-secrets-webhook app.kubernetes.io/version: v0.10.0