Update from template

Template version: main (8840f87)

.cruft.json

@@ -7,11 +7,11 @@
       "name": "fluentbit",
       "slug": "fluentbit",
       "parameter_key": "fluentbit",
-      "test_cases": "defaults",
+      "test_cases": "defaults config",
       "add_lib": "n",
       "add_pp": "y",
       "add_golden": "y",
-      "add_matrix": "n",
+      "add_matrix": "y",
       "add_go_unit": "n",
       "automerge_patch": "y",
       "automerge_patch_v0": "n",

.github/workflows/test.yaml

@@ -29,6 +29,11 @@ jobs:
           args: 'check'
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        instance:
+          - defaults
+          - config
     defaults:
       run:
         working-directory: ${{ env.COMPONENT_NAME }}
@@ -37,9 +42,14 @@ jobs:
         with:
           path: ${{ env.COMPONENT_NAME }}
       - name: Compile component
-        run: make test
+        run: make test -e instance=${{ matrix.instance }}
   golden:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        instance:
+          - defaults
+          - config
     defaults:
       run:
         working-directory: ${{ env.COMPONENT_NAME }}
@@ -48,4 +58,4 @@ jobs:
         with:
           path: ${{ env.COMPONENT_NAME }}
       - name: Golden diff
-        run: make golden-diff
+        run: make golden-diff -e instance=${{ matrix.instance }}

Makefile

@@ -71,6 +71,22 @@ golden-diff: commodore_args += -f tests/$(instance).yml
 golden-diff: clean .compile ## Diff compile output against the reference version. Review output and run `make gen-golden golden-diff` if this target fails.
 	@git diff --exit-code --minimal --no-index -- tests/golden/$(instance) compiled/
 
+.PHONY: golden-diff-all
+golden-diff-all: recursive_target=golden-diff
+golden-diff-all: $(test_instances) ## Run golden-diff for all instances. Note: this doesn't work when running make with multiple parallel jobs (-j != 1).
+
+.PHONY: gen-golden-all
+gen-golden-all: recursive_target=gen-golden
+gen-golden-all: $(test_instances) ## Run gen-golden for all instances. Note: this doesn't work when running make with multiple parallel jobs (-j != 1).
+
+.PHONY: lint_kubent_all
+lint_kubent_all: recursive_target=lint_kubent
+lint_kubent_all: $(test_instances) ## Lint deprecated Kubernetes API versions for all golden test instances. Will exit on first error. Note: this doesn't work when running make with multiple parallel jobs (-j != 1).
+
+.PHONY: $(test_instances)
+$(test_instances):
+	$(MAKE) $(recursive_target) -e instance=$(basename $(@F))
+
 .PHONY: clean
 clean: ## Clean the project
 	rm -rf .cache compiled dependencies vendor helmcharts jsonnetfile*.json || true

Makefile.vars.mk

@@ -57,3 +57,4 @@ KUBENT_IMAGE    ?= ghcr.io/doitintl/kube-no-trouble:latest
 KUBENT_DOCKER   ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=/app/kubent $(KUBENT_IMAGE)
 
 instance ?= defaults
+test_instances = tests/defaults.yml tests/config.yml

renovate.json

@@ -13,7 +13,7 @@
   "separateMinorPatch": true,
   "postUpgradeTasks": {
     "commands": [
-      "make gen-golden"
+      "make gen-golden-all"
     ],
     "fileFilters": [
       "tests/golden/**"

tests/config.yml

@@ -0,0 +1,10 @@
+parameters:
+  fluentbit:
+    secrets:
+      AWS_ACCESS_KEY_ID: <SUPER_SECRET>
+      AWS_SECRET_ACCESS_KEY: <EVEN_MORE_SUPERER>
+
+    helm_values:
+      envFrom:
+        - secretRef:
+            name: ${_instance}

tests/defaults.yml

@@ -1,3 +1,3 @@
----
-parameters:
-  fluentbit: {}
+# Overwrite parameters here
+
+# parameters: {...}

tests/golden/config/fluentbit/apps/fluentbit.yaml

@@ -0,0 +1,3 @@
+spec:
+  source:
+    path: manifests/fluentbit/fluentbit

tests/golden/config/fluentbit/fluentbit/fluentbit/00_namespace.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations: {}
+  labels:
+    name: syn-fluentbit
+  name: syn-fluentbit

tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrole.yaml

@@ -0,0 +1,20 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/instance: fluentbit
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: fluent-bit
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
+  name: fluentbit
+rules:
+  - apiGroups:
+      - ''
+    resources:
+      - namespaces
+      - pods
+    verbs:
+      - get
+      - list
+      - watch

tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/clusterrolebinding.yaml

@@ -0,0 +1,18 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/instance: fluentbit
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: fluent-bit
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
+  name: fluentbit
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: fluentbit
+subjects:
+  - kind: ServiceAccount
+    name: fluentbit
+    namespace: syn-fluentbit

tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/daemonset.yaml

@@ -0,0 +1,75 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  labels:
+    app.kubernetes.io/instance: fluentbit
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: fluent-bit
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
+  name: fluentbit
+  namespace: syn-fluentbit
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: fluentbit
+      app.kubernetes.io/name: fluent-bit
+  template:
+    metadata:
+      annotations:
+        checksum/config: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+        checksum/syn-config: 06e588437d65a5b9ef0171f6ac0a59e7
+        fluentbit.io/exclude: 'true'
+      labels:
+        app.kubernetes.io/instance: fluentbit
+        app.kubernetes.io/name: fluent-bit
+    spec:
+      containers:
+        - args:
+            - --workdir=/fluent-bit/etc
+            - --config=/fluent-bit/etc/conf/fluent-bit.conf
+          command:
+            - /fluent-bit/bin/fluent-bit
+          image: docker.io/fluent/fluent-bit:3.1.4
+          imagePullPolicy: IfNotPresent
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          name: fluent-bit
+          ports:
+            - containerPort: 2020
+              name: http
+              protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /api/v1/health
+              port: http
+          volumeMounts:
+            - mountPath: /fluent-bit/etc/conf
+              name: config
+            - mountPath: /var/log
+              name: varlog
+            - mountPath: /var/lib/docker/containers
+              name: varlibdockercontainers
+              readOnly: true
+            - mountPath: /etc/machine-id
+              name: etcmachineid
+              readOnly: true
+      dnsPolicy: ClusterFirst
+      hostNetwork: false
+      serviceAccountName: fluentbit
+      volumes:
+        - configMap:
+            name: fluentbit
+          name: config
+        - hostPath:
+            path: /var/log
+          name: varlog
+        - hostPath:
+            path: /var/lib/docker/containers
+          name: varlibdockercontainers
+        - hostPath:
+            path: /etc/machine-id
+            type: File
+          name: etcmachineid

tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/service.yaml

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/instance: fluentbit
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: fluent-bit
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
+  name: fluentbit
+  namespace: syn-fluentbit
+spec:
+  ports:
+    - name: http
+      port: 2020
+      protocol: TCP
+      targetPort: http
+  selector:
+    app.kubernetes.io/instance: fluentbit
+    app.kubernetes.io/name: fluent-bit
+  type: ClusterIP

tests/golden/config/fluentbit/fluentbit/fluentbit/01_fluentbit_helmchart/fluent-bit/templates/serviceaccount.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/instance: fluentbit
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: fluent-bit
+    app.kubernetes.io/version: 3.1.4
+    helm.sh/chart: fluent-bit-0.47.5
+  name: fluentbit
+  namespace: syn-fluentbit

tests/golden/config/fluentbit/fluentbit/fluentbit/10_custom_config.yaml

@@ -0,0 +1,44 @@
+apiVersion: v1
+data:
+  custom_parsers.conf: ''
+  fluent-bit.conf: |
+    [SERVICE]
+        Daemon Off
+        Flush 1
+        HTTP_Listen 0.0.0.0
+        HTTP_Port 2020
+        HTTP_Server On
+        Log_Level info
+        Parsers_File parsers.conf
+        Plugins_File plugins.conf
+    [FILTER]
+        Name kubernetes
+        K8S-Logging.Exclude On
+        K8S-Logging.Parser On
+        Keep_Log On
+        Match kube.*
+        Merge_Log On
+    [INPUT]
+        Name tail
+        Mem_Buf_Limit 5MB
+        Parser docker
+        Path /var/log/containers/*.log
+        Skip_Long_lines On
+        Tag kube.*
+    [INPUT]
+        Name systemd
+        Read_From_Tail On
+        Systemd_Filter _SYSTEMD_UNIT=kubelet.service
+        Tag host.*
+kind: ConfigMap
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/component: fluent-bit
+    app.kubernetes.io/instance: fluentbit
+    app.kubernetes.io/managed-by: commodore
+    app.kubernetes.io/name: fluent-bit
+    app.kubernetes.io/version: 3.1.4
+    name: fluentbit
+  name: fluentbit
+  namespace: syn-fluentbit

tests/golden/config/fluentbit/fluentbit/fluentbit/10_custom_secret.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+data: {}
+kind: Secret
+metadata:
+  annotations: {}
+  labels:
+    app.kubernetes.io/component: fluent-bit
+    app.kubernetes.io/instance: fluentbit
+    app.kubernetes.io/managed-by: commodore
+    app.kubernetes.io/name: fluent-bit
+    name: fluentbit
+  name: fluentbit
+stringData:
+  AWS_ACCESS_KEY_ID: <SUPER_SECRET>
+  AWS_SECRET_ACCESS_KEY: <EVEN_MORE_SUPERER>
+type: Opaque