diff --git a/.github/workflows/charts-lint.yaml b/.github/workflows/charts-lint.yaml index 57b6b9cd..cdebef8a 100644 --- a/.github/workflows/charts-lint.yaml +++ b/.github/workflows/charts-lint.yaml @@ -132,7 +132,7 @@ jobs: working-directory: charts/${{ matrix.chart }} run: | yq -i '. |= .dependencies |= map(select(.name == "common" and .repository == "https://bjw-s-labs.github.io/helm-charts").version = ">0.0.0-0")' Chart.yaml - yq -i '. |= .dependencies |= map(select(.name == "common" and .repository == "https://bjw-s-labs.github.io/helm-charts").repository = "file://${COMMON_LIBRARY_LOCATION}")' Chart.yaml + yq -i '. |= .dependencies |= map(select(.name == "common" and .repository == "https://bjw-s-labs.github.io/helm-charts").repository = "file://" + strenv(COMMON_LIBRARY_LOCATION))' Chart.yaml echo "::group::Modified Chart.yaml" cat Chart.yaml echo "::endgroup::" diff --git a/.github/workflows/charts-test.yaml b/.github/workflows/charts-test.yaml index 5e76e12e..b95d5b33 100644 --- a/.github/workflows/charts-test.yaml +++ b/.github/workflows/charts-test.yaml @@ -89,7 +89,7 @@ jobs: working-directory: charts/${{ matrix.chart }} run: | yq -i '. |= .dependencies |= map(select(.name == "common" and .repository == "https://bjw-s-labs.github.io/helm-charts").version = ">0.0.0-0")' Chart.yaml - yq -i '. |= .dependencies |= map(select(.name == "common" and .repository == "https://bjw-s-labs.github.io/helm-charts").repository = "file://${COMMON_LIBRARY_LOCATION}")' Chart.yaml + yq -i '. |= .dependencies |= map(select(.name == "common" and .repository == "https://bjw-s-labs.github.io/helm-charts").repository = "file://" + strenv(COMMON_LIBRARY_LOCATION))' Chart.yaml echo "::group::Modified Chart.yaml" cat Chart.yaml echo "::endgroup::" diff --git a/charts/other/app-template/Chart.yaml b/charts/other/app-template/Chart.yaml index 44b660a5..76c9a643 100644 --- a/charts/other/app-template/Chart.yaml +++ b/charts/other/app-template/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: A common powered chart template. This can be useful for small projects that don't have their own chart. name: app-template -version: 4.0.1 +version: 4.1.0 kubeVersion: ">=1.28.0-0" maintainers: - name: bjw-s @@ -10,16 +10,16 @@ maintainers: dependencies: - name: common repository: https://bjw-s-labs.github.io/helm-charts - version: 4.0.1 + version: 4.1.0 sources: - https://github.com/bjw-s-labs/helm-charts annotations: artifacthub.io/changes: |- - kind: changed description: |- - Upgraded the common library to v4.0.1 + Upgraded the common library to v4.1.0 links: - name: Upgrade notes url: https://bjw-s-labs.github.io/helm-charts/docs/app-template/upgrade-instructions/ - name: Detailed release notes - url: https://github.com/bjw-s-labs/helm-charts/releases/tag/common-4.0.1 + url: https://github.com/bjw-s-labs/helm-charts/releases/tag/common-4.1.0 diff --git a/charts/other/app-template/README.md b/charts/other/app-template/README.md index 57fb84ce..5eec905a 100644 --- a/charts/other/app-template/README.md +++ b/charts/other/app-template/README.md @@ -1,6 +1,6 @@ # app-template -![Version: 4.0.1](https://img.shields.io/badge/Version-4.0.1-informational?style=flat-square) +![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square) A common powered chart template. This can be useful for small projects that don't have their own chart. @@ -12,7 +12,7 @@ Kubernetes: `>=1.28.0-0` | Repository | Name | Version | |------------|------|---------| -| https://bjw-s-labs.github.io/helm-charts | common | 4.0.1 | +| https://bjw-s-labs.github.io/helm-charts | common | 4.1.0 | ## Installing the Chart diff --git a/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json b/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json index cb9ab432..5bad934c 100644 --- a/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json +++ b/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json @@ -726,7 +726,7 @@ "values": { "description": "Values holds the values for this Helm release.", "x-kubernetes-preserve-unknown-fields": true, - "$ref": "https://raw.githubusercontent.com/bjw-s-labs/helm-charts/common-4.0.1/charts/library/common/values.schema.json" + "$ref": "https://raw.githubusercontent.com/bjw-s-labs/helm-charts/common-4.1.0/charts/library/common/values.schema.json" }, "valuesFrom": { "description": "ValuesFrom holds references to resources containing Helm values for this HelmRelease,\nand information about how they should be merged.", diff --git a/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json b/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json index 6989229d..e6df4e5f 100644 --- a/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json +++ b/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json @@ -727,7 +727,7 @@ "values": { "description": "Values holds the values for this Helm release.", "x-kubernetes-preserve-unknown-fields": true, - "$ref": "https://raw.githubusercontent.com/bjw-s-labs/helm-charts/common-4.0.1/charts/library/common/values.schema.json" + "$ref": "https://raw.githubusercontent.com/bjw-s-labs/helm-charts/common-4.1.0/charts/library/common/values.schema.json" }, "valuesFrom": { "description": "ValuesFrom holds references to resources containing Helm values for this HelmRelease, and information about how they should be merged.", diff --git a/charts/other/app-template/values.schema.json b/charts/other/app-template/values.schema.json index bdb00822..f56ba787 100644 --- a/charts/other/app-template/values.schema.json +++ b/charts/other/app-template/values.schema.json @@ -1,3 +1,3 @@ { - "$ref": "https://raw.githubusercontent.com/bjw-s-labs/helm-charts/common-4.0.1/charts/library/common/values.schema.json" + "$ref": "https://raw.githubusercontent.com/bjw-s-labs/helm-charts/common-4.1.0/charts/library/common/values.schema.json" } diff --git a/examples/flux/helmrelease.yaml b/examples/flux/helmrelease.yaml index eb91416c..ba7341f2 100644 --- a/examples/flux/helmrelease.yaml +++ b/examples/flux/helmrelease.yaml @@ -1,6 +1,6 @@ --- -# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-3.2.0/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-4.1.0/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json +apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: &app vaultwarden @@ -12,7 +12,7 @@ spec: chart: app-template # -- Version of the app-template helm chart # this example is not automatically updated, so be sure to use the latest chart version - version: 3.2.0 + version: 4.1.0 interval: 15m sourceRef: kind: HelmRepository diff --git a/examples/flux/helmrepository.yaml b/examples/flux/helmrepository.yaml index 306112c3..43605628 100644 --- a/examples/flux/helmrepository.yaml +++ b/examples/flux/helmrepository.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: name: bjw-s-helm-charts diff --git a/examples/helm/home-assistant/values.yaml b/examples/helm/home-assistant/values.yaml index 53959cac..ee448b63 100644 --- a/examples/helm/home-assistant/values.yaml +++ b/examples/helm/home-assistant/values.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-3.2.0/charts/other/app-template/values.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-4.1.0/charts/other/app-template/values.schema.json # Configure options applied to all pods defaultPodOptions: diff --git a/examples/helm/qbittorrent/values.yaml b/examples/helm/qbittorrent/values.yaml index e0e6bb88..db225eaf 100644 --- a/examples/helm/qbittorrent/values.yaml +++ b/examples/helm/qbittorrent/values.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-3.2.0/charts/other/app-template/values.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-4.1.0/charts/other/app-template/values.schema.json # Configure options applied to all pods defaultPodOptions: diff --git a/examples/helm/vaultwarden/values.yaml b/examples/helm/vaultwarden/values.yaml index e5873e52..daa11209 100644 --- a/examples/helm/vaultwarden/values.yaml +++ b/examples/helm/vaultwarden/values.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-3.2.0/charts/other/app-template/values.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-4.1.0/charts/other/app-template/values.schema.json controllers: main: diff --git a/examples/kustomize/kustomization.yaml b/examples/kustomize/kustomization.yaml index 87a62a32..b75e2f62 100644 --- a/examples/kustomize/kustomization.yaml +++ b/examples/kustomize/kustomization.yaml @@ -5,7 +5,7 @@ helmCharts: - name: app-template repo: https://bjw-s-labs.github.io/helm-charts/ # this example is not automatically updated, so be sure to use the latest chart version - version: 3.2.0 + version: 4.1.0 releaseName: &releaseName vaultwarden namespace: &releaseNamespace default valuesFile: values.yaml diff --git a/examples/kustomize/values.yaml b/examples/kustomize/values.yaml index 5fad08cb..f1a541e2 100644 --- a/examples/kustomize/values.yaml +++ b/examples/kustomize/values.yaml @@ -1,5 +1,5 @@ --- -# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-3.2.0/charts/other/app-template/values.schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s-labs/helm-charts/app-template-4.1.0/charts/other/app-template/values.schema.json controllers: main: