test

ct.yaml → .github/configs/ct.yaml

@@ -6,12 +6,9 @@ chart-dirs:
   - helm/
 chart-repos:
   - buttahtoast=https://buttahtoast.github.io/helm-charts/
-  - bedag=https://bedag.github.io/helm-charts/
   - bitnami=https://charts.bitnami.com/bitnami
 validate-chart-schema: true
 validate-maintainers: false
 validate-yaml: true
 exclude-deprecated: true
-check-version-increment: false
-excluded-charts:
-  - "manifests"
+check-version-increment: false

.github/workflows/helm-test.yml

@@ -21,12 +21,12 @@ jobs:
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
-          changed=$(ct list-changed --config ./ct.yaml)
+          changed=$(ct list-changed --config .github/configs/ct.yaml)
           if [[ -n "$changed" ]]; then
             echo "::set-output name=changed::true"
           fi
       - name: Run chart-testing (lint)
-        run: ct lint --debug --config ./ct.yaml --lint-conf ./lintconf.yaml
+        run: ct lint --debug --config .github/configs/ct.yaml --lint-conf .github/configs/lintconf.yaml
       - name: Run docs-testing (helm-docs)
         id: helm-docs
         run: |
@@ -46,5 +46,5 @@ jobs:
 
       # Install Charts
       - name: Run chart-testing (install)
-        run: ct install --debug --config ./ct.yaml
+        run: ct install --debug --config .github/configs/ct.yaml
         if: steps.list-changed.outputs.changed == 'true'

Makefile

@@ -70,7 +70,7 @@ helm-docs:
 
 helm-lint: CT_VERSION := v3.3.1
 helm-lint:
-	@docker run -v "$(SRC_ROOT):/workdir" --entrypoint /bin/sh quay.io/helmpack/chart-testing:$(CT_VERSION) -c "cd /workdir; ct lint --config ct.yaml --lint-conf lintconf.yaml --all --debug"
+	@docker run -v "$(SRC_ROOT):/workdir" --entrypoint /bin/sh quay.io/helmpack/chart-testing:$(CT_VERSION) -c "cd /workdir; ct lint --config .github/configs/ct.yaml --lint-conf .github/configs/lintconf.yaml --all --debug"
 
 
 KO = $(shell pwd)/bin/ko

helm/cloudflare-tunnel-ingress-controller/templates/ingressclass.yaml → charts/cloudflare-tunnel-ingress-controller/templates/ingressclass.yaml

@@ -5,4 +5,8 @@ metadata:
     ingressclass.kubernetes.io/is-default-class: {{ .Values.ingressClass.isDefaultClass | quote }}
   name: {{ .Values.ingressClass.name }}
 spec:
+  {{- if .Values.ingressClass.controllerValue }}
   controller: {{ .Values.ingressClass.controllerValue }}
+  {{- else }}
+  controller: "oliverbaehler.io/{{ include "cloudflare-tunnel-ingress-controller.fullname" $ }}"
+  {{- end }}

helm/cloudflare-tunnel-ingress-controller/values.yaml → charts/cloudflare-tunnel-ingress-controller/values.yaml

@@ -22,7 +22,7 @@ ingressClass:
   # -- Ingress class name
   name: cloudflare-tunnel
   # -- Ingress class controller
-  controllerValue: cloudflare-tunnel-ingress-controller
+  controllerValue: ""
   # -- Cluster default ingress class
   isDefaultClass: false