From e998657cd7514d16256cc1ed22b21c2874d4d5e4 Mon Sep 17 00:00:00 2001 From: Daniel Riggins Date: Mon, 23 Jan 2023 15:31:51 -0600 Subject: [PATCH 1/2] Fix secret-replicator values.yaml syntax (#256) Co-authored-by: David Young --- README.md | 2 +- .../ssl-certificates/secret-replicator.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index eb89854..e79def4 100644 --- a/README.md +++ b/README.md @@ -93,4 +93,4 @@ Impulsively **[click here (NOW quick do it!)][github_sponsor]** to [sponsor me][ [github_sponsor]: https://github.com/sponsors/funkypenguin [discourse]: https://forum.funkypenguin.co.nz/ [contact]: https://www.funkypenguin.co.nz -[mastodon]: https://so.fnky.nz/@funkypenguin \ No newline at end of file +[mastodon]: https://so.fnky.nz/@funkypenguin diff --git a/docs/kubernetes/ssl-certificates/secret-replicator.md b/docs/kubernetes/ssl-certificates/secret-replicator.md index bbc9651..0fb6ea0 100644 --- a/docs/kubernetes/ssl-certificates/secret-replicator.md +++ b/docs/kubernetes/ssl-certificates/secret-replicator.md @@ -82,12 +82,12 @@ data: # Declare variables to be passed into your templates. image: - repository: kiwigrid/secret-replicator - tag: 0.2.0 - pullPolicy: IfNotPresent - ## Specify ImagePullSecrets for Pods - ## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod - # pullSecrets: myregistrykey + repository: kiwigrid/secret-replicator + tag: latest #0.2.0 It's 0.1.0 and latest listed in dockerhub. No 0.2.0 anymore + pullPolicy: IfNotPresent + ## Specify ImagePullSecrets for Pods + ## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod + # pullSecrets: myregistrykey # csv list of secrets secretList: "letsencrypt-wildcard-cert" @@ -96,7 +96,7 @@ data: ignoreNamespaces: "kube-system,kube-public" # If defined, allow secret-replicator to watch for secrets in _another_ namespace - secretNamespace: letsencrypt-wildcard-cert" + secretNamespace: "letsencrypt-wildcard-cert" rbac: enabled: true From fc6712457d5868ae876ece66e2b5302be94fb1a6 Mon Sep 17 00:00:00 2001 From: Daniel Riggins Date: Mon, 23 Jan 2023 20:27:15 -0600 Subject: [PATCH 2/2] Replace Bitnami chart w/Metallb for kubernetes/loadbalancer/metallb/index.md (#257) Co-authored-by: Daniel Riggins --- docs/kubernetes/loadbalancer/metallb/index.md | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/kubernetes/loadbalancer/metallb/index.md b/docs/kubernetes/loadbalancer/metallb/index.md index 03d1b04..721e10e 100644 --- a/docs/kubernetes/loadbalancer/metallb/index.md +++ b/docs/kubernetes/loadbalancer/metallb/index.md @@ -67,17 +67,17 @@ metadata: ### HelmRepository -Next, we need to define a HelmRepository (*a repository of helm charts*), to which we'll refer when we create the HelmRelease. We only need to do this once per-repository. In this case, we're using the (*prolific*) [bitnami chart repository](https://github.com/bitnami/charts/tree/master/bitnami), so per the [flux design](/kubernetes/deployment/flux/), I create this example yaml in my flux repo: +Next, we need to define a HelmRepository (*a repository of helm charts*), to which we'll refer when we create the HelmRelease. We only need to do this once per-repository. In this case, we're using the (*prolific*) [metallb chart repository](https://github.com/metallb/metallb/tree/main/charts/metallb), so per the [flux design](/kubernetes/deployment/flux/), I create this example yaml in my flux repo: -```yaml title="/bootstrap/helmrepositories/helmrepository-bitnami.yaml" -apiVersion: source.toolkit.fluxcd.io/v1beta1 +```yaml title="/bootstrap/helmrepositories/helmrepository-metallb.yaml" +apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository metadata: - name: bitnami + name: metallb namespace: flux-system spec: interval: 15m - url: https://charts.bitnami.com/bitnami + url: https://metallb.github.io/metallb ``` ### Kustomization @@ -113,7 +113,7 @@ spec: ### ConfigMap (for HelmRelease) -Now we're into the metallb-specific YAMLs. First, we create a ConfigMap, containing the entire contents of the helm chart's [values.yaml](https://github.com/bitnami/charts/blob/master/bitnami/metallb/values.yaml). Paste the values into a `values.yaml` key as illustrated below, indented 4 spaces (*since they're "encapsulated" within the ConfigMap YAML*). I create this example yaml in my flux repo at ``: +Now we're into the metallb-specific YAMLs. First, we create a ConfigMap, containing the entire contents of the helm chart's [values.yaml](https://github.com/metallb/metallb/blob/main/charts/metallb/values.yaml). Paste the values into a `values.yaml` key as illustrated below, indented 4 spaces (*since they're "encapsulated" within the ConfigMap YAML*). I create this example yaml in my flux repo at ``: ```yaml title="/metallb-system/configmap-metallb-helm-chart-value-overrides.yaml" apiVersion: v1 @@ -130,9 +130,7 @@ data: --8<-- "kubernetes-why-full-values-in-configmap.md" -Then work your way through the values you pasted, and change any which are specific to your configuration. I'd recommend changing the following: - -* `commonAnnotations`: Anticipating the future use of Reloader to bounce applications when their config changes, I add the `configmap.reloader.stakater.com/reload: "metallb-config"` annotation to all deployed objects, which will instruct Reloader to bounce the daemonset if the ConfigMap changes. +Then work your way through the values you pasted, and change any which are specific to your configuration. ### Kustomization for CRs (Config) @@ -261,10 +259,10 @@ spec: chart: spec: chart: metallb - version: 4.x + version: 0.13.7 sourceRef: kind: HelmRepository - name: bitnami + name: metallb namespace: flux-system interval: 15m timeout: 5m