From b7b107c99ae4dd304f77e9abe23ba64a035184ed Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 14 Nov 2021 11:43:45 +0100 Subject: [PATCH] chore(Apps): move traefik and k8s gateway to core train --- .github/workflows/apps.test.yaml | 3 +++ .github/workflows/renovate-bump.yaml | 3 +++ charts/{stable => core}/k8s-gateway/.helmignore | 0 charts/{stable => core}/k8s-gateway/CHANGELOG.md | 0 charts/{stable => core}/k8s-gateway/CONFIG.md | 0 charts/{stable => core}/k8s-gateway/Chart.yaml | 5 ++--- charts/{stable => core}/k8s-gateway/README.md | 0 charts/{stable => core}/k8s-gateway/helm-values.md | 0 charts/{stable => core}/k8s-gateway/questions.yaml | 0 charts/{stable => core}/k8s-gateway/templates/_configmap.tpl | 0 charts/{stable => core}/k8s-gateway/templates/common.yaml | 0 charts/{stable => core}/k8s-gateway/values.yaml | 0 charts/{stable => core}/traefik/.helmignore | 0 charts/{stable => core}/traefik/CHANGELOG.md | 0 charts/{stable => core}/traefik/CONFIG.md | 0 charts/{stable => core}/traefik/Chart.yaml | 4 ++-- charts/{stable => core}/traefik/README.md | 0 charts/{stable => core}/traefik/crds/ingressroute.yaml | 0 charts/{stable => core}/traefik/crds/ingressroutetcp.yaml | 0 charts/{stable => core}/traefik/crds/ingressrouteudp.yaml | 0 charts/{stable => core}/traefik/crds/middlewares.yaml | 0 charts/{stable => core}/traefik/crds/middlewarestcp.yaml | 0 charts/{stable => core}/traefik/crds/serverstransports.yaml | 0 charts/{stable => core}/traefik/crds/tlsoptions.yaml | 0 charts/{stable => core}/traefik/crds/tlsstores.yaml | 0 charts/{stable => core}/traefik/crds/traefikservices.yaml | 0 charts/{stable => core}/traefik/helm-values.md | 0 charts/{stable => core}/traefik/questions.yaml | 0 charts/{stable => core}/traefik/templates/_args.tpl | 0 charts/{stable => core}/traefik/templates/_helpers.tpl | 0 charts/{stable => core}/traefik/templates/_ingressclass.tpl | 0 charts/{stable => core}/traefik/templates/_ingressroute.tpl | 0 charts/{stable => core}/traefik/templates/_portalhook.tpl | 0 charts/{stable => core}/traefik/templates/_tlsoptions.tpl | 0 charts/{stable => core}/traefik/templates/common.yaml | 0 .../traefik/templates/middlewares/basic-middleware.yaml | 0 .../traefik/templates/middlewares/basicauth.yaml | 0 .../traefik/templates/middlewares/chain.yaml | 0 .../traefik/templates/middlewares/forwardauth.yaml | 0 .../traefik/templates/middlewares/ipwhitelist.yaml | 0 .../traefik/templates/middlewares/ratelimit.yaml | 0 .../traefik/templates/middlewares/redirectScheme.yaml | 0 .../traefik/templates/middlewares/redirectregex.yaml | 0 .../traefik/templates/middlewares/tc-nextcloud.yaml | 0 charts/{stable => core}/traefik/values.yaml | 0 tools/bump.sh | 2 +- 46 files changed, 11 insertions(+), 6 deletions(-) rename charts/{stable => core}/k8s-gateway/.helmignore (100%) rename charts/{stable => core}/k8s-gateway/CHANGELOG.md (100%) rename charts/{stable => core}/k8s-gateway/CONFIG.md (100%) rename charts/{stable => core}/k8s-gateway/Chart.yaml (95%) rename charts/{stable => core}/k8s-gateway/README.md (100%) rename charts/{stable => core}/k8s-gateway/helm-values.md (100%) rename charts/{stable => core}/k8s-gateway/questions.yaml (100%) rename charts/{stable => core}/k8s-gateway/templates/_configmap.tpl (100%) rename charts/{stable => core}/k8s-gateway/templates/common.yaml (100%) rename charts/{stable => core}/k8s-gateway/values.yaml (100%) rename charts/{stable => core}/traefik/.helmignore (100%) rename charts/{stable => core}/traefik/CHANGELOG.md (100%) rename charts/{stable => core}/traefik/CONFIG.md (100%) rename charts/{stable => core}/traefik/Chart.yaml (95%) rename charts/{stable => core}/traefik/README.md (100%) rename charts/{stable => core}/traefik/crds/ingressroute.yaml (100%) rename charts/{stable => core}/traefik/crds/ingressroutetcp.yaml (100%) rename charts/{stable => core}/traefik/crds/ingressrouteudp.yaml (100%) rename charts/{stable => core}/traefik/crds/middlewares.yaml (100%) rename charts/{stable => core}/traefik/crds/middlewarestcp.yaml (100%) rename charts/{stable => core}/traefik/crds/serverstransports.yaml (100%) rename charts/{stable => core}/traefik/crds/tlsoptions.yaml (100%) rename charts/{stable => core}/traefik/crds/tlsstores.yaml (100%) rename charts/{stable => core}/traefik/crds/traefikservices.yaml (100%) rename charts/{stable => core}/traefik/helm-values.md (100%) rename charts/{stable => core}/traefik/questions.yaml (100%) rename charts/{stable => core}/traefik/templates/_args.tpl (100%) rename charts/{stable => core}/traefik/templates/_helpers.tpl (100%) rename charts/{stable => core}/traefik/templates/_ingressclass.tpl (100%) rename charts/{stable => core}/traefik/templates/_ingressroute.tpl (100%) rename charts/{stable => core}/traefik/templates/_portalhook.tpl (100%) rename charts/{stable => core}/traefik/templates/_tlsoptions.tpl (100%) rename charts/{stable => core}/traefik/templates/common.yaml (100%) rename charts/{stable => core}/traefik/templates/middlewares/basic-middleware.yaml (100%) rename charts/{stable => core}/traefik/templates/middlewares/basicauth.yaml (100%) rename charts/{stable => core}/traefik/templates/middlewares/chain.yaml (100%) rename charts/{stable => core}/traefik/templates/middlewares/forwardauth.yaml (100%) rename charts/{stable => core}/traefik/templates/middlewares/ipwhitelist.yaml (100%) rename charts/{stable => core}/traefik/templates/middlewares/ratelimit.yaml (100%) rename charts/{stable => core}/traefik/templates/middlewares/redirectScheme.yaml (100%) rename charts/{stable => core}/traefik/templates/middlewares/redirectregex.yaml (100%) rename charts/{stable => core}/traefik/templates/middlewares/tc-nextcloud.yaml (100%) rename charts/{stable => core}/traefik/values.yaml (100%) diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml index 77f99c10877..0ee49fc302d 100644 --- a/.github/workflows/apps.test.yaml +++ b/.github/workflows/apps.test.yaml @@ -33,6 +33,7 @@ jobs: - 'charts/incubator/**' - 'charts/dependency/**' - 'charts/library/**' + - 'charts/core/**' - run: echo '${{ toJson(steps.filter.outputs) }}' > changes.json - id: reduce run: | @@ -87,6 +88,8 @@ jobs: train="dev" elif test -f "./charts/dependency/${{ matrix.app }}/Chart.yaml"; then train="dependency" + elif test -f "./charts/core/${{ matrix.app }}/Chart.yaml"; then + train="core" else train="incubator" fi diff --git a/.github/workflows/renovate-bump.yaml b/.github/workflows/renovate-bump.yaml index a7981418b2a..4116b9cced4 100644 --- a/.github/workflows/renovate-bump.yaml +++ b/.github/workflows/renovate-bump.yaml @@ -33,6 +33,7 @@ jobs: - 'charts/incubator/**' - 'charts/library/**' - 'charts/dependency/**' + - 'charts/core/**' - name: Filter filter-output run: echo '${{ toJson(steps.filter.outputs) }}' > changes.json - name: Bump @@ -52,6 +53,8 @@ jobs: train="library" elif test -f "./charts/dependency/${{ matrix.app }}/Chart.yaml"; then train="dependency" + elif test -f "./charts/core/${{ matrix.app }}/Chart.yaml"; then + train="core" else train="incubator" fi diff --git a/charts/stable/k8s-gateway/.helmignore b/charts/core/k8s-gateway/.helmignore similarity index 100% rename from charts/stable/k8s-gateway/.helmignore rename to charts/core/k8s-gateway/.helmignore diff --git a/charts/stable/k8s-gateway/CHANGELOG.md b/charts/core/k8s-gateway/CHANGELOG.md similarity index 100% rename from charts/stable/k8s-gateway/CHANGELOG.md rename to charts/core/k8s-gateway/CHANGELOG.md diff --git a/charts/stable/k8s-gateway/CONFIG.md b/charts/core/k8s-gateway/CONFIG.md similarity index 100% rename from charts/stable/k8s-gateway/CONFIG.md rename to charts/core/k8s-gateway/CONFIG.md diff --git a/charts/stable/k8s-gateway/Chart.yaml b/charts/core/k8s-gateway/Chart.yaml similarity index 95% rename from charts/stable/k8s-gateway/Chart.yaml rename to charts/core/k8s-gateway/Chart.yaml index f7676396287..c97f540911f 100644 --- a/charts/stable/k8s-gateway/Chart.yaml +++ b/charts/core/k8s-gateway/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.1.8" dependencies: - name: common repository: https://truecharts.org - version: 8.5.4 + version: 8.5.6 deprecated: false description: A Helm chart for the k8s_gateway CoreDNS plugin home: https://github.com/truecharts/apps/tree/master/charts/stable/k8s-gateway @@ -20,10 +20,9 @@ name: k8s-gateway sources: - https://github.com/ori-edge/k8s_gateway type: application -version: 4.0.7 +version: 4.0.8 annotations: truecharts.org/catagories: | - networking - truecharts.org/SCALE-support: "true" truecharts.org/grade: U diff --git a/charts/stable/k8s-gateway/README.md b/charts/core/k8s-gateway/README.md similarity index 100% rename from charts/stable/k8s-gateway/README.md rename to charts/core/k8s-gateway/README.md diff --git a/charts/stable/k8s-gateway/helm-values.md b/charts/core/k8s-gateway/helm-values.md similarity index 100% rename from charts/stable/k8s-gateway/helm-values.md rename to charts/core/k8s-gateway/helm-values.md diff --git a/charts/stable/k8s-gateway/questions.yaml b/charts/core/k8s-gateway/questions.yaml similarity index 100% rename from charts/stable/k8s-gateway/questions.yaml rename to charts/core/k8s-gateway/questions.yaml diff --git a/charts/stable/k8s-gateway/templates/_configmap.tpl b/charts/core/k8s-gateway/templates/_configmap.tpl similarity index 100% rename from charts/stable/k8s-gateway/templates/_configmap.tpl rename to charts/core/k8s-gateway/templates/_configmap.tpl diff --git a/charts/stable/k8s-gateway/templates/common.yaml b/charts/core/k8s-gateway/templates/common.yaml similarity index 100% rename from charts/stable/k8s-gateway/templates/common.yaml rename to charts/core/k8s-gateway/templates/common.yaml diff --git a/charts/stable/k8s-gateway/values.yaml b/charts/core/k8s-gateway/values.yaml similarity index 100% rename from charts/stable/k8s-gateway/values.yaml rename to charts/core/k8s-gateway/values.yaml diff --git a/charts/stable/traefik/.helmignore b/charts/core/traefik/.helmignore similarity index 100% rename from charts/stable/traefik/.helmignore rename to charts/core/traefik/.helmignore diff --git a/charts/stable/traefik/CHANGELOG.md b/charts/core/traefik/CHANGELOG.md similarity index 100% rename from charts/stable/traefik/CHANGELOG.md rename to charts/core/traefik/CHANGELOG.md diff --git a/charts/stable/traefik/CONFIG.md b/charts/core/traefik/CONFIG.md similarity index 100% rename from charts/stable/traefik/CONFIG.md rename to charts/core/traefik/CONFIG.md diff --git a/charts/stable/traefik/Chart.yaml b/charts/core/traefik/Chart.yaml similarity index 95% rename from charts/stable/traefik/Chart.yaml rename to charts/core/traefik/Chart.yaml index 2068561ca39..b6fa3cb2b2a 100644 --- a/charts/stable/traefik/Chart.yaml +++ b/charts/core/traefik/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.5.4" dependencies: - name: common repository: https://truecharts.org - version: 8.5.4 + version: 8.5.6 deprecated: false description: Test App for Traefik home: https://github.com/truecharts/apps/tree/master/charts/stable/traefik @@ -22,7 +22,7 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 10.0.9 +version: 10.0.10 annotations: truecharts.org/catagories: | - network diff --git a/charts/stable/traefik/README.md b/charts/core/traefik/README.md similarity index 100% rename from charts/stable/traefik/README.md rename to charts/core/traefik/README.md diff --git a/charts/stable/traefik/crds/ingressroute.yaml b/charts/core/traefik/crds/ingressroute.yaml similarity index 100% rename from charts/stable/traefik/crds/ingressroute.yaml rename to charts/core/traefik/crds/ingressroute.yaml diff --git a/charts/stable/traefik/crds/ingressroutetcp.yaml b/charts/core/traefik/crds/ingressroutetcp.yaml similarity index 100% rename from charts/stable/traefik/crds/ingressroutetcp.yaml rename to charts/core/traefik/crds/ingressroutetcp.yaml diff --git a/charts/stable/traefik/crds/ingressrouteudp.yaml b/charts/core/traefik/crds/ingressrouteudp.yaml similarity index 100% rename from charts/stable/traefik/crds/ingressrouteudp.yaml rename to charts/core/traefik/crds/ingressrouteudp.yaml diff --git a/charts/stable/traefik/crds/middlewares.yaml b/charts/core/traefik/crds/middlewares.yaml similarity index 100% rename from charts/stable/traefik/crds/middlewares.yaml rename to charts/core/traefik/crds/middlewares.yaml diff --git a/charts/stable/traefik/crds/middlewarestcp.yaml b/charts/core/traefik/crds/middlewarestcp.yaml similarity index 100% rename from charts/stable/traefik/crds/middlewarestcp.yaml rename to charts/core/traefik/crds/middlewarestcp.yaml diff --git a/charts/stable/traefik/crds/serverstransports.yaml b/charts/core/traefik/crds/serverstransports.yaml similarity index 100% rename from charts/stable/traefik/crds/serverstransports.yaml rename to charts/core/traefik/crds/serverstransports.yaml diff --git a/charts/stable/traefik/crds/tlsoptions.yaml b/charts/core/traefik/crds/tlsoptions.yaml similarity index 100% rename from charts/stable/traefik/crds/tlsoptions.yaml rename to charts/core/traefik/crds/tlsoptions.yaml diff --git a/charts/stable/traefik/crds/tlsstores.yaml b/charts/core/traefik/crds/tlsstores.yaml similarity index 100% rename from charts/stable/traefik/crds/tlsstores.yaml rename to charts/core/traefik/crds/tlsstores.yaml diff --git a/charts/stable/traefik/crds/traefikservices.yaml b/charts/core/traefik/crds/traefikservices.yaml similarity index 100% rename from charts/stable/traefik/crds/traefikservices.yaml rename to charts/core/traefik/crds/traefikservices.yaml diff --git a/charts/stable/traefik/helm-values.md b/charts/core/traefik/helm-values.md similarity index 100% rename from charts/stable/traefik/helm-values.md rename to charts/core/traefik/helm-values.md diff --git a/charts/stable/traefik/questions.yaml b/charts/core/traefik/questions.yaml similarity index 100% rename from charts/stable/traefik/questions.yaml rename to charts/core/traefik/questions.yaml diff --git a/charts/stable/traefik/templates/_args.tpl b/charts/core/traefik/templates/_args.tpl similarity index 100% rename from charts/stable/traefik/templates/_args.tpl rename to charts/core/traefik/templates/_args.tpl diff --git a/charts/stable/traefik/templates/_helpers.tpl b/charts/core/traefik/templates/_helpers.tpl similarity index 100% rename from charts/stable/traefik/templates/_helpers.tpl rename to charts/core/traefik/templates/_helpers.tpl diff --git a/charts/stable/traefik/templates/_ingressclass.tpl b/charts/core/traefik/templates/_ingressclass.tpl similarity index 100% rename from charts/stable/traefik/templates/_ingressclass.tpl rename to charts/core/traefik/templates/_ingressclass.tpl diff --git a/charts/stable/traefik/templates/_ingressroute.tpl b/charts/core/traefik/templates/_ingressroute.tpl similarity index 100% rename from charts/stable/traefik/templates/_ingressroute.tpl rename to charts/core/traefik/templates/_ingressroute.tpl diff --git a/charts/stable/traefik/templates/_portalhook.tpl b/charts/core/traefik/templates/_portalhook.tpl similarity index 100% rename from charts/stable/traefik/templates/_portalhook.tpl rename to charts/core/traefik/templates/_portalhook.tpl diff --git a/charts/stable/traefik/templates/_tlsoptions.tpl b/charts/core/traefik/templates/_tlsoptions.tpl similarity index 100% rename from charts/stable/traefik/templates/_tlsoptions.tpl rename to charts/core/traefik/templates/_tlsoptions.tpl diff --git a/charts/stable/traefik/templates/common.yaml b/charts/core/traefik/templates/common.yaml similarity index 100% rename from charts/stable/traefik/templates/common.yaml rename to charts/core/traefik/templates/common.yaml diff --git a/charts/stable/traefik/templates/middlewares/basic-middleware.yaml b/charts/core/traefik/templates/middlewares/basic-middleware.yaml similarity index 100% rename from charts/stable/traefik/templates/middlewares/basic-middleware.yaml rename to charts/core/traefik/templates/middlewares/basic-middleware.yaml diff --git a/charts/stable/traefik/templates/middlewares/basicauth.yaml b/charts/core/traefik/templates/middlewares/basicauth.yaml similarity index 100% rename from charts/stable/traefik/templates/middlewares/basicauth.yaml rename to charts/core/traefik/templates/middlewares/basicauth.yaml diff --git a/charts/stable/traefik/templates/middlewares/chain.yaml b/charts/core/traefik/templates/middlewares/chain.yaml similarity index 100% rename from charts/stable/traefik/templates/middlewares/chain.yaml rename to charts/core/traefik/templates/middlewares/chain.yaml diff --git a/charts/stable/traefik/templates/middlewares/forwardauth.yaml b/charts/core/traefik/templates/middlewares/forwardauth.yaml similarity index 100% rename from charts/stable/traefik/templates/middlewares/forwardauth.yaml rename to charts/core/traefik/templates/middlewares/forwardauth.yaml diff --git a/charts/stable/traefik/templates/middlewares/ipwhitelist.yaml b/charts/core/traefik/templates/middlewares/ipwhitelist.yaml similarity index 100% rename from charts/stable/traefik/templates/middlewares/ipwhitelist.yaml rename to charts/core/traefik/templates/middlewares/ipwhitelist.yaml diff --git a/charts/stable/traefik/templates/middlewares/ratelimit.yaml b/charts/core/traefik/templates/middlewares/ratelimit.yaml similarity index 100% rename from charts/stable/traefik/templates/middlewares/ratelimit.yaml rename to charts/core/traefik/templates/middlewares/ratelimit.yaml diff --git a/charts/stable/traefik/templates/middlewares/redirectScheme.yaml b/charts/core/traefik/templates/middlewares/redirectScheme.yaml similarity index 100% rename from charts/stable/traefik/templates/middlewares/redirectScheme.yaml rename to charts/core/traefik/templates/middlewares/redirectScheme.yaml diff --git a/charts/stable/traefik/templates/middlewares/redirectregex.yaml b/charts/core/traefik/templates/middlewares/redirectregex.yaml similarity index 100% rename from charts/stable/traefik/templates/middlewares/redirectregex.yaml rename to charts/core/traefik/templates/middlewares/redirectregex.yaml diff --git a/charts/stable/traefik/templates/middlewares/tc-nextcloud.yaml b/charts/core/traefik/templates/middlewares/tc-nextcloud.yaml similarity index 100% rename from charts/stable/traefik/templates/middlewares/tc-nextcloud.yaml rename to charts/core/traefik/templates/middlewares/tc-nextcloud.yaml diff --git a/charts/stable/traefik/values.yaml b/charts/core/traefik/values.yaml similarity index 100% rename from charts/stable/traefik/values.yaml rename to charts/core/traefik/values.yaml diff --git a/tools/bump.sh b/tools/bump.sh index 31e33eeb4ab..23406a7083d 100755 --- a/tools/bump.sh +++ b/tools/bump.sh @@ -40,7 +40,7 @@ function incr_semver() { BUMPTYPE=${1} if [ -z ${2+x} ]; then -for train in stable incubator develop non-free deprecated; do +for train in stable incubator develop non-free deprecated dependency core; do for chart in charts/${train}/*; do if [ -d "${chart}" ]; then echo "Bumping patch version for ${train}/${chart}"