Commit8026374

committed

Fix Helm push

1 parentba33633 commit8026374Copy full SHA for 8026374

File tree

+30

-7

lines changed

+30

-7

lines changed

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,3 +56,25 @@ jobs:`
`56`	`56`	`docker tag coder-logstream-kube:latest $BASE:latest`
`57`	`57`	`docker push $IMAGE`
`58`	`58`	`docker push $BASE:latest`
	`59`	`+`
	`60`	`+ -name:Authenticate to Google Cloud`
	`61`	`+uses:google-github-actions/auth@v1`
	`62`	`+with:`
	`63`	`+workload_identity_provider:${{ secrets.GCP_WORKLOAD_ID_PROVIDER }}`
	`64`	`+service_account:${{ secrets.GCP_SERVICE_ACCOUNT }}`
	`65`	`+`
	`66`	`+ -name:Setup GCloud SDK`
	`67`	`+uses:"google-github-actions/setup-gcloud@v1"`
	`68`	`+`
	`69`	`+ -name:Publish Helm Chart`
	`70`	`+run:\|`
	`71`	`+ set -euo pipefail`
	`72`	`+ version="$(./scripts/version.sh)"`
	`73`	`+ ./scripts/helm.sh --version $version`
	`74`	`+`
	`75`	`+ mkdir -p build/helm`
	`76`	`+ cp "build/${version}.tgz" build/helm`
	`77`	`+ gsutil cp gs://helm.coder.com/logstream-kube/index.yaml build/helm/index.yaml`
	`78`	`+ helm repo index build/helm --url https://helm.coder.com/logstream-kube --merge build/helm/index.yaml`
	`79`	`+ gsutil -h "Cache-Control:no-cache,max-age=0" cp build/helm/${version}.tgz gs://helm.coder.com/logstream-kube`
	`80`	`+ gsutil -h "Cache-Control:no-cache,max-age=0" cp build/helm/index.yaml gs://helm.coder.com/logstream-kube`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,11 @@ func TestPodEventLogger(t *testing.T) {`
`34`	`34`	`client:=fake.NewSimpleClientset()`
`35`	`35`	`ctx:=context.Background()`
`36`	`36`	`reporter,err:=newPodEventLogger(ctx,podEventLoggerOptions{`
`37`		`-client:client,`
`38`		`-coderURL:agentURL,`
`39`		`-namespace:namespace,`
`40`		`-logger:slogtest.Make(t,nil),`
	`37`	`+client:client,`
	`38`	`+coderURL:agentURL,`
	`39`	`+namespace:namespace,`
	`40`	`+logger:slogtest.Make(t,nil),`
	`41`	`+logDebounce:time.Millisecond,`
`41`	`42`	`})`
`42`	`43`	`require.NoError(t,err)`
`43`	`44`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`# If no version is specified, defaults to the version from ./version.sh.`
`10`	`10`	`#`
`11`	`11`	`# If no output path is specified, defaults to`
`12`		`-# "$repo_root/build/coder_helm_$version.tgz".`
	`12`	`+# "$repo_root/build/coder_logstream_kube_helm_$version.tgz".`
`13`	`13`	`#`
`14`	`14`	`# If the --push parameter is specified, the resulting artifact will be published`
`15`	`15`	# to the Coder OSS repo. This requires `gsutil` to be installed and configured.
`@@ -54,12 +54,12 @@ done`
`54`	`54`	`# Remove the "v" prefix.`
`55`	`55`	`version="${version#v}"`
`56`	`56`	`if [["$version"=="" ]];then`
`57`		`-version="$(execrelative ./version.sh)"`
	`57`	`+version="$(./scripts/version.sh)"`
`58`	`58`	`fi`
`59`	`59`
`60`	`60`	`if [["$output_path"=="" ]];then`
`61`	`61`	`mkdir -p build`
`62`		`-output_path="$(realpath"build/coder_helm_$version.tgz")"`
	`62`	`+output_path="$(realpath"build/$version.tgz")"`
`63`	`63`	`fi`
`64`	`64`
`65`	`65`	`# Make a destination temporary directory, as you cannot fully control the output`

Comments

(0)