Merge branch 'main' into main

2021-04-15 13:59:21 -07:00
commit 9a8e20cc31
@@ -15,7 +15,6 @@ spec:
        kind: HelmRepository
        name: k8s-at-home-charts
        namespace: flux-system
-      interval: 5m
  values:
    image:
      repository: b4bz/homer
@@ -15,7 +15,6 @@ spec:
        kind: HelmRepository
        name: ingress-nginx-charts
        namespace: flux-system
-      interval: 5m
  values:
    controller:
      ingressClass: nginx
@@ -1,5 +1,5 @@
 ---
-# Flux version: v0.12.1
+# Flux version: v0.12.3
 # Components: source-controller,kustomize-controller,helm-controller,notification-controller
 apiVersion: v1
 kind: Namespace
@@ -7,7 +7,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: flux-system
 ---
 apiVersion: apiextensions.k8s.io/v1
@@ -19,7 +19,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: alerts.notification.toolkit.fluxcd.io
 spec:
  group: notification.toolkit.fluxcd.io
@@ -194,7 +194,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: buckets.source.toolkit.fluxcd.io
 spec:
  group: source.toolkit.fluxcd.io
@@ -382,7 +382,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: gitrepositories.source.toolkit.fluxcd.io
 spec:
  group: source.toolkit.fluxcd.io
@@ -601,7 +601,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: helmcharts.source.toolkit.fluxcd.io
 spec:
  group: source.toolkit.fluxcd.io
@@ -793,7 +793,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: helmreleases.helm.toolkit.fluxcd.io
 spec:
  group: helm.toolkit.fluxcd.io
@@ -1309,7 +1309,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: helmrepositories.source.toolkit.fluxcd.io
 spec:
  group: source.toolkit.fluxcd.io
@@ -1477,7 +1477,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: kustomizations.kustomize.toolkit.fluxcd.io
 spec:
  group: kustomize.toolkit.fluxcd.io
@@ -1874,7 +1874,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: providers.notification.toolkit.fluxcd.io
 spec:
  group: notification.toolkit.fluxcd.io
@@ -2021,7 +2021,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: receivers.notification.toolkit.fluxcd.io
 spec:
  group: notification.toolkit.fluxcd.io
@@ -2201,7 +2201,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: helm-controller
  namespace: flux-system
 ---
@@ -2211,7 +2211,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: kustomize-controller
  namespace: flux-system
 ---
@@ -2221,7 +2221,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: notification-controller
  namespace: flux-system
 ---
@@ -2231,7 +2231,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: source-controller
  namespace: flux-system
 ---
@@ -2241,7 +2241,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: crd-controller-flux-system
 rules:
 - apiGroups:
@@ -2321,7 +2321,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: cluster-reconciler-flux-system
 roleRef:
  apiGroup: rbac.authorization.k8s.io
@@ -2341,7 +2341,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
  name: crd-controller-flux-system
 roleRef:
  apiGroup: rbac.authorization.k8s.io
@@ -2373,7 +2373,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
    control-plane: controller
  name: notification-controller
  namespace: flux-system
@@ -2393,7 +2393,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
    control-plane: controller
  name: source-controller
  namespace: flux-system
@@ -2413,7 +2413,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
    control-plane: controller
  name: webhook-receiver
  namespace: flux-system
@@ -2433,7 +2433,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
    control-plane: controller
  name: helm-controller
  namespace: flux-system
@@ -2506,7 +2506,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
    control-plane: controller
  name: kustomize-controller
  namespace: flux-system
@@ -2581,7 +2581,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
    control-plane: controller
  name: notification-controller
  namespace: flux-system
@@ -2657,7 +2657,7 @@ metadata:
  labels:
    app.kubernetes.io/instance: flux-system
    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.12.1
+    app.kubernetes.io/version: v0.12.3
    control-plane: controller
  name: source-controller
  namespace: flux-system
@@ -15,7 +15,6 @@ spec:
        kind: HelmRepository
        name: jetstack-charts
        namespace: flux-system
-      interval: 5m
  values:
    installCRDs: false
    webhook:
@@ -30,8 +29,3 @@ spec:
      nameservers:
      - "1.1.1.1"
      - "8.8.8.8"
-    prometheus:
-      enabled: false
-      servicemonitor:
-        enabled: false
-        prometheusInstance: monitoring
@@ -1,6 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+- crd
+- helm-release.yaml
 - letsencrypt-production.yaml
 - letsencrypt-staging.yaml
 - secret.enc.yaml
@@ -0,0 +1,8 @@
+# yamllint disable
+apiVersion: v1
+kind: Secret
+metadata:
+    name: cloudflare-token-secret
+    namespace: cert-manager
+stringData:
+    cloudflare-token: ${BOOTSTRAP_CLOUDFLARE_TOKEN}
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- cert-manager
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- cert-manager
- metallb
@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
- crds
- infrastructure
 - namespaces
- operators
+- metallb-system
+- cert-manager
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: metallb
-  namespace: networking
+  namespace: metallb-system
 spec:
  interval: 5m
  chart:
@@ -14,7 +14,6 @@ spec:
        kind: HelmRepository
        name: bitnami-charts
        namespace: flux-system
-      interval: 10m
  values:
    controller:
      image:
@@ -24,11 +23,6 @@ spec:
      image:
        repository: metallb/speaker
        tag: v0.9.6
-    prometheus:
-      serviceMonitor:
-        enabled: false
-      prometheusRule:
-        enabled: false
    configInline:
      address-pools:
      - name: default
@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - cert-manager.yaml
- networking.yaml
+- metallb-system.yaml
@@ -2,4 +2,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: networking
+  name: metallb-system
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- helm-release.yaml
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- cert-manager