diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 21869bc..56c12c5 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -22,7 +22,7 @@ jobs: check-latest: true - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (list-changed) id: list-changed diff --git a/_readme_templates.gotmpl b/_readme_templates.gotmpl index 8b28a2d..6fa60da 100644 --- a/_readme_templates.gotmpl +++ b/_readme_templates.gotmpl @@ -5,7 +5,7 @@ {{ template "chart.description" . }} -This helm chart is maintain and released by the fluxcd-community on a best effort basis. +This helm chart is maintained and released by the fluxcd-community on a best effort basis. {{ template "chart.homepageLine" . }} diff --git a/charts/flux2-multi-tenancy/Chart.yaml b/charts/flux2-multi-tenancy/Chart.yaml index b7a5b64..0549b4e 100644 --- a/charts/flux2-multi-tenancy/Chart.yaml +++ b/charts/flux2-multi-tenancy/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: flux2-multi-tenancy -version: 0.0.5 +version: 0.0.6 deprecated: true description: A Helm chart for flux2-multi-tenancy sources: @@ -13,4 +13,4 @@ dependencies: condition: kyverno.enabled annotations: artifacthub.io/changes: | - - "Mark this chart as DEPRECATED. Since upstream appversion 0.26.0 this can be done wilth Multi-Tenancy Lockdown Use `multitenancy.enabled` in flux2 chart >=0.11.0" + - "docs: fix grammar" diff --git a/charts/flux2-multi-tenancy/README.md b/charts/flux2-multi-tenancy/README.md index 844fdae..5760b16 100644 --- a/charts/flux2-multi-tenancy/README.md +++ b/charts/flux2-multi-tenancy/README.md @@ -2,11 +2,11 @@ > **:exclamation: This Helm Chart is deprecated!** -![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart for flux2-multi-tenancy -This helm chart is maintain and released by the fluxcd-community on a best effort basis. +This helm chart is maintained and released by the fluxcd-community on a best effort basis. ## Source Code diff --git a/charts/flux2-multi-tenancy/tests/__snapshot__/kyverno-policy_test.yaml.snap b/charts/flux2-multi-tenancy/tests/__snapshot__/kyverno-policy_test.yaml.snap index 845090e..ec7e40d 100644 --- a/charts/flux2-multi-tenancy/tests/__snapshot__/kyverno-policy_test.yaml.snap +++ b/charts/flux2-multi-tenancy/tests/__snapshot__/kyverno-policy_test.yaml.snap @@ -9,7 +9,7 @@ should match snapshot of default values: app.kubernetes.io/instance: NAMESPACE app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux - helm.sh/chart: flux2-multi-tenancy-0.0.5 + helm.sh/chart: flux2-multi-tenancy-0.0.6 name: RELEASE-NAME namespace: NAMESPACE spec: diff --git a/charts/flux2-notification/Chart.yaml b/charts/flux2-notification/Chart.yaml index 8c2472e..232be64 100644 --- a/charts/flux2-notification/Chart.yaml +++ b/charts/flux2-notification/Chart.yaml @@ -1,11 +1,11 @@ apiVersion: v2 name: flux2-notification type: application -version: 1.12.3 +version: 1.12.4 appVersion: 2.1.2 description: A Helm chart for flux2 alerts and the needed providers and secrets sources: - https://github.com/fluxcd-community/helm-charts annotations: artifacthub.io/changes: | - - "[Chore]: Update App Version to upstream 2.1.2" + - "docs: fix grammar"" diff --git a/charts/flux2-notification/README.md b/charts/flux2-notification/README.md index c46e657..136a698 100644 --- a/charts/flux2-notification/README.md +++ b/charts/flux2-notification/README.md @@ -1,10 +1,10 @@ # flux2-notification -![Version: 1.12.3](https://img.shields.io/badge/Version-1.12.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square) +![Version: 1.12.4](https://img.shields.io/badge/Version-1.12.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square) A Helm chart for flux2 alerts and the needed providers and secrets -This helm chart is maintain and released by the fluxcd-community on a best effort basis. +This helm chart is maintained and released by the fluxcd-community on a best effort basis. ## Source Code diff --git a/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap b/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap index 97df4d0..108466e 100644 --- a/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap +++ b/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 - helm.sh/chart: flux2-notification-1.12.3 + helm.sh/chart: flux2-notification-1.12.4 name: all-kustomizations namespace: NAMESPACE spec: diff --git a/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap b/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap index 5fa74d8..5b4f0f2 100644 --- a/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap +++ b/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 - helm.sh/chart: flux2-notification-1.12.3 + helm.sh/chart: flux2-notification-1.12.4 name: on-call-slack namespace: NAMESPACE spec: diff --git a/charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap b/charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap index 515cdfd..b82d2ea 100644 --- a/charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap +++ b/charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap @@ -8,7 +8,7 @@ should match snapshot of default values: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 - helm.sh/chart: flux2-notification-1.12.3 + helm.sh/chart: flux2-notification-1.12.4 name: webhook-url namespace: NAMESPACE stringData: diff --git a/charts/flux2-sync/Chart.yaml b/charts/flux2-sync/Chart.yaml index 0f191a4..5bbf08a 100644 --- a/charts/flux2-sync/Chart.yaml +++ b/charts/flux2-sync/Chart.yaml @@ -1,11 +1,11 @@ apiVersion: v2 name: flux2-sync type: application -version: 1.7.2 +version: 1.7.3 appVersion: 2.1.2 description: A Helm chart for flux2 GitRepository to sync with sources: - https://github.com/fluxcd-community/helm-charts annotations: artifacthub.io/changes: | - - "[Chore]: Update App Version to upstream 2.1.2" + - "docs: fix grammar" diff --git a/charts/flux2-sync/README.md b/charts/flux2-sync/README.md index 55872f2..ccc5717 100644 --- a/charts/flux2-sync/README.md +++ b/charts/flux2-sync/README.md @@ -1,10 +1,10 @@ # flux2-sync -![Version: 1.7.2](https://img.shields.io/badge/Version-1.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square) +![Version: 1.7.3](https://img.shields.io/badge/Version-1.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square) A Helm chart for flux2 GitRepository to sync with -This helm chart is maintain and released by the fluxcd-community on a best effort basis. +This helm chart is maintained and released by the fluxcd-community on a best effort basis. ## Source Code diff --git a/charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap b/charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap index 01edcee..6afa51c 100644 --- a/charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap +++ b/charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap @@ -7,7 +7,7 @@ should match snapshot of default values: app.kubernetes.io/instance: NAMESPACE app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux - helm.sh/chart: flux2-sync-1.7.2 + helm.sh/chart: flux2-sync-1.7.3 name: RELEASE-NAME namespace: NAMESPACE spec: @@ -24,7 +24,7 @@ should match snapshot with special values: app.kubernetes.io/instance: NAMESPACE app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux - helm.sh/chart: flux2-sync-1.7.2 + helm.sh/chart: flux2-sync-1.7.3 name: RELEASE-NAME namespace: NAMESPACE spec: diff --git a/charts/flux2-sync/tests/__snapshot__/flux-kustomization_test.yaml.snap b/charts/flux2-sync/tests/__snapshot__/flux-kustomization_test.yaml.snap index b063132..4cf1dc3 100644 --- a/charts/flux2-sync/tests/__snapshot__/flux-kustomization_test.yaml.snap +++ b/charts/flux2-sync/tests/__snapshot__/flux-kustomization_test.yaml.snap @@ -7,7 +7,7 @@ should match kubeconfig: app.kubernetes.io/instance: NAMESPACE app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux - helm.sh/chart: flux2-sync-1.7.2 + helm.sh/chart: flux2-sync-1.7.3 name: RELEASE-NAME namespace: NAMESPACE spec: diff --git a/charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap b/charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap index 86f6557..48c4d1e 100644 --- a/charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap +++ b/charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/instance: NAMESPACE app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux - helm.sh/chart: flux2-sync-1.7.2 + helm.sh/chart: flux2-sync-1.7.3 name: RELEASE-NAME namespace: NAMESPACE type: Opaque diff --git a/charts/flux2/Chart.yaml b/charts/flux2/Chart.yaml index 9a7f305..8f95ab3 100644 --- a/charts/flux2/Chart.yaml +++ b/charts/flux2/Chart.yaml @@ -1,6 +1,6 @@ annotations: artifacthub.io/changes: | - - "feat: upgrade to FluxCD 2.1.2" + - "feat: add ingress resource for notificationController's receiver webhook service" apiVersion: v2 appVersion: 2.1.2 description: A Helm chart for flux2 @@ -8,4 +8,4 @@ name: flux2 sources: - https://github.com/fluxcd-community/helm-charts type: application -version: 2.10.6 +version: 2.11.0 diff --git a/charts/flux2/README.md b/charts/flux2/README.md index bbfba27..0828685 100644 --- a/charts/flux2/README.md +++ b/charts/flux2/README.md @@ -1,10 +1,10 @@ # flux2 -![Version: 2.10.6](https://img.shields.io/badge/Version-2.10.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square) +![Version: 2.11.0](https://img.shields.io/badge/Version-2.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square) A Helm chart for flux2 -This helm chart is maintain and released by the fluxcd-community on a best effort basis. +This helm chart is maintained and released by the fluxcd-community on a best effort basis. ## Source Code @@ -131,6 +131,13 @@ This helm chart is maintain and released by the fluxcd-community on a best effor | notificationController.serviceAccount.create | bool | `true` | | | notificationController.tag | string | `"v1.1.0"` | | | notificationController.tolerations | list | `[]` | | +| notificationController.webhookReceiver.ingress.annotations | object | `{}` | | +| notificationController.webhookReceiver.ingress.create | bool | `false` | | +| notificationController.webhookReceiver.ingress.hosts[0].host | string | `"flux-webhook.example.com"` | | +| notificationController.webhookReceiver.ingress.hosts[0].paths[0].path | string | `"/"` | | +| notificationController.webhookReceiver.ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | +| notificationController.webhookReceiver.ingress.labels | object | `{}` | | +| notificationController.webhookReceiver.ingress.tls | list | `[]` | | | notificationController.webhookReceiver.service.annotations | object | `{}` | | | notificationController.webhookReceiver.service.labels | object | `{}` | | | policies.create | bool | `true` | | diff --git a/charts/flux2/templates/notification-controller-ingress.yaml b/charts/flux2/templates/notification-controller-ingress.yaml new file mode 100644 index 0000000..942cd68 --- /dev/null +++ b/charts/flux2/templates/notification-controller-ingress.yaml @@ -0,0 +1,49 @@ +{{- if and .Values.notificationController.create .Values.notificationController.webhookReceiver.ingress.create }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + labels: + app.kubernetes.io/instance: {{ .Release.Namespace | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + app.kubernetes.io/part-of: flux + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + control-plane: controller + {{- with .Values.notificationController.webhookReceiver.ingress.labels }}{{ toYaml . | nindent 4 }}{{ end }} + {{- with .Values.notificationController.webhookReceiver.ingress.annotations }} + annotations: + {{- range $key, $value := . }} + {{ $key }}: {{ tpl $value $ | quote }} + {{- end }} + {{- end }} + name: webhook-receiver +spec: + {{- if .Values.notificationController.webhookReceiver.ingress.ingressClassName }} + ingressClassName: {{ .Values.notificationController.webhookReceiver.ingress.ingressClassName }} + {{- end -}} + {{- if .Values.notificationController.webhookReceiver.ingress.tls }} + tls: + {{- range .Values.notificationController.webhookReceiver.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.notificationController.webhookReceiver.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + pathType: {{ .pathType }} + backend: + service: + name: webhook-receiver + port: + number: 80 + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap index bdcacbe..cc574a3 100644 --- a/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.6 + helm.sh/chart: flux2-2.11.0 labeltestkey: labeltestvalue labeltestkey2: labeltestvalue2 name: helm-controller diff --git a/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap index 188aa89..a1be71c 100644 --- a/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.6 + helm.sh/chart: flux2-2.11.0 name: image-automation-controller spec: replicas: 1 diff --git a/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap index 023268d..943c503 100644 --- a/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.6 + helm.sh/chart: flux2-2.11.0 name: image-reflector-controller spec: replicas: 1 diff --git a/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap b/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap index 8b3b8f3..ab911ea 100644 --- a/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 - helm.sh/chart: flux2-2.10.6 + helm.sh/chart: flux2-2.11.0 name: test1 namespace: NAMESPACE type: Opaque diff --git a/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap index dba0333..0395972 100644 --- a/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.6 + helm.sh/chart: flux2-2.11.0 name: kustomize-controller spec: replicas: 1 diff --git a/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap index 53009fc..a332a24 100644 --- a/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.6 + helm.sh/chart: flux2-2.11.0 name: notification-controller spec: replicas: 1 diff --git a/charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap b/charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap index 6a4959b..e3cddba 100644 --- a/charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap @@ -12,7 +12,7 @@ should match snapshot of default values: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 - helm.sh/chart: flux2-2.10.6 + helm.sh/chart: flux2-2.11.0 name: RELEASE-NAME-flux-check spec: backoffLimit: 1 @@ -23,7 +23,7 @@ should match snapshot of default values: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 - helm.sh/chart: flux2-2.10.6 + helm.sh/chart: flux2-2.11.0 name: RELEASE-NAME spec: automountServiceAccountToken: true diff --git a/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap index d1eae93..196457c 100644 --- a/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap @@ -10,7 +10,7 @@ should match snapshot of default values: app.kubernetes.io/part-of: flux app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.6 + helm.sh/chart: flux2-2.11.0 name: source-controller spec: replicas: 1 diff --git a/charts/flux2/values.yaml b/charts/flux2/values.yaml index 9cbafdb..1e02c24 100644 --- a/charts/flux2/values.yaml +++ b/charts/flux2/values.yaml @@ -213,6 +213,24 @@ notificationController: service: labels: {} annotations: {} + ingress: + create: false + # ingressClassName: nginx + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + labels: {} + hosts: + - host: flux-webhook.example.com + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: flux-webhook-tls + # hosts: + # - flux-webhook.example.com + + nodeSelector: {} affinity: {} tolerations: []