diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 428928262..53067b2d1 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -2,7 +2,7 @@ name: CI-pullrequest on: pull_request: - branches: [ master ] + branches: [ gh-pages ] jobs: build: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 21f27608b..7c0493a71 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -2,7 +2,7 @@ name: CI-push on: push: - branches: [ master ] + branches: [ gh-pages ] jobs: build: diff --git a/docs/CNAME b/docs/CNAME deleted file mode 100644 index 2932ecd1b..000000000 --- a/docs/CNAME +++ /dev/null @@ -1 +0,0 @@ -partner-charts.rancher.io \ No newline at end of file diff --git a/docs/dynatrace-oneagent-operator/dynatrace-oneagent-operator-0.8.000.tgz b/docs/dynatrace-oneagent-operator/dynatrace-oneagent-operator-0.8.000.tgz deleted file mode 100644 index d64342c89..000000000 Binary files a/docs/dynatrace-oneagent-operator/dynatrace-oneagent-operator-0.8.000.tgz and /dev/null differ diff --git a/docs/index.yaml b/docs/index.yaml deleted file mode 100644 index b48baa22e..000000000 --- a/docs/index.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: v1 -entries: - dynatrace-oneagent-operator: - - annotations: - catalog.cattle.io/certified: partner - catalog.cattle.io/namespace: dynatrace-oneagent-operator-system - catalog.cattle.io/release-name: dynatrace-oneagent-operator - apiVersion: v2 - appVersion: 0.8.0 - created: "2020-07-31T19:17:56.763530948Z" - description: The Dynatrace OneAgent Operator Helm chart for Kubernetes and Openshift - digest: 03e23ce41e3a83dbfa218ed2a59948e34df6d1757f506373a07bc6d359be7c58 - home: https://www.dynatrace.com/ - icon: https://assets.dynatrace.com/global/resources/Signet_Logo_RGB_CP_512x512px.png - maintainers: - - email: marco.mader@dynatrace.com - name: DTMad - - email: luis.garcia@dynatrace.com - name: lrgar - - email: michael.mayr@dynatrace.com - name: mmayr-at - name: dynatrace-oneagent-operator - sources: - - https://github.com/Dynatrace/helm-charts - type: application - urls: - - https://dev-charts.rancher.io/dynatrace-oneagent-operator/dynatrace-oneagent-operator-0.8.000.tgz - version: 0.8.000 -generated: "2020-07-31T19:17:56.735465007Z" diff --git a/packages/dynatrace-oneagent-operator/package.yaml b/packages/dynatrace-oneagent-operator/package.yaml index 259d2223b..29d684be0 100644 --- a/packages/dynatrace-oneagent-operator/package.yaml +++ b/packages/dynatrace-oneagent-operator/package.yaml @@ -1,5 +1,5 @@ url: https://github.com/Dynatrace/helm-charts subdirectory: dynatrace-oneagent-operator -commit: dynatrace-oneagent-operator-v0.8.0 +commit: b705675f8020979642fe44af51e7886ecf8502ee type: git packageVersion: 00 diff --git a/scripts/generate-charts b/scripts/generate-charts index d7536628c..0574effc6 100755 --- a/scripts/generate-charts +++ b/scripts/generate-charts @@ -4,7 +4,7 @@ set -e add=0 for f in packages/*; do if [[ -z $CHART || $CHART == $(basename -- ${f}) ]]; then - mkdir -p docs/$(basename -- ${f}) + mkdir -p assets/$(basename -- ${f}) if [[ -d ${f}/overlay ]]; then cp -R ${f}/overlay/* ${f}/charts fi @@ -13,11 +13,12 @@ for f in packages/*; do packageVersion=$(yq r ${f}/package.yaml packageVersion) yq w -i ${f}/charts/Chart.yaml 'version' "${version}${packageVersion}" fi - helm package ${f}/charts --destination docs/$(basename -- ${f}) - git checkout docs/$(basename -- ${f})/"$(basename -- ${f})-$(yq r ${f}/charts/Chart.yaml version).tgz" || true + helm package ${f}/charts --destination assets/$(basename -- ${f}) + git checkout assets/$(basename -- ${f})/"$(basename -- ${f})-$(yq r ${f}/charts/Chart.yaml version).tgz" 2>/dev/null || true fi done if [[ -n $(git ls-files --other | grep "tgz") ]]; then - helm repo index --merge ./docs/index.yaml --url https://dev-charts.rancher.io docs + helm repo index --merge ./assets/index.yaml --url assets assets + cp ./assets/index.yaml . fi diff --git a/scripts/generate-patch b/scripts/generate-patch index 5eaa7316d..adcd68228 100755 --- a/scripts/generate-patch +++ b/scripts/generate-patch @@ -27,7 +27,8 @@ for f in packages/*; do fi if [[ $type == 'git' ]]; then mkdir -p /tmp/tmp-charts - git clone $url /tmp/tmp-charts + git clone --depth=1 --no-tags $url /tmp/tmp-charts + git fetch origin $commit pwd=$(pwd) cd /tmp/tmp-charts git checkout $commit diff --git a/scripts/prepare b/scripts/prepare index 81a05e5f8..80199a2ca 100755 --- a/scripts/prepare +++ b/scripts/prepare @@ -19,9 +19,10 @@ for f in packages/*; do mkdir -p ${f}/charts if [[ $type == 'git' ]]; then mkdir -p /tmp/tmp-charts - git clone $url /tmp/tmp-charts + git clone --depth=1 --no-tags $url /tmp/tmp-charts pwd=$(pwd) cd /tmp/tmp-charts + git fetch origin $commit git checkout $commit cd $pwd rm -rf ${f}/charts @@ -57,4 +58,4 @@ for f in packages/*; do done fi fi -done \ No newline at end of file +done