Update render-helm-charts with example changes. (#943)

Co-authored-by: Bharath KKB <[email protected]>
Co-authored-by: Awais Malik <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: g-awmalik <[email protected]>
Co-authored-by: zyy98 <[email protected]>
Co-authored-by: Natasha Sarkar <[email protected]>
Co-authored-by: Snyk bot <[email protected]>
Co-authored-by: Mengqi Yu <[email protected]>
Co-authored-by: Justin Santa Barbara <[email protected]>
Co-authored-by: Wietse Muizelaar <[email protected]>
Co-authored-by: Christopher Fry <[email protected]>
Co-authored-by: sdowell <[email protected]>

.github/workflows/ci.yaml

@@ -59,10 +59,10 @@ jobs:
       GOPATH: /home/runner/work/kpt-functions-catalog/functions/go
       GO111MODULE: on
     steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
         id: go
       - name: Check out code into GOPATH
         uses: actions/checkout@v1
@@ -92,10 +92,10 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Install kpt
         run: |
           go install github.com/GoogleContainerTools/kpt@main

.github/workflows/firebase-hosting-merge.yml

@@ -12,17 +12,16 @@ jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
+          node-version: 16
       - name: Merge gob branch
         run: git worktree add ./gob gob && cp -r gob/* .
+          node-version: 16
       - name: Generate Site
         run: make site-generate
-      - uses: FirebaseExtended/action-hosting-deploy@276388dd6c2cde23455b30293105cc866c22282d # v0
+      - uses: FirebaseExtended/action-hosting-deploy@4d0d0023f1d92b9b7d16dda64b3d7abd2c98974b
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_KPT_DEV }}'

.github/workflows/verify-docs.yaml

@@ -19,10 +19,10 @@ jobs:
     - name: Install libs
       run: |
         pip install pyyaml
-    - name: Set up Go 1.17
+    - name: Set up Go 1.18
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - name: Install mdrip
       run: |
         go install github.com/monopole/[email protected]

Makefile

@@ -42,6 +42,12 @@ check-licenses:
 	cd contrib/functions/go && $(MAKE) check-licenses
 	cd contrib/functions/ts && $(MAKE) check-licenses
 
+add-licenses:
+	cd functions/go && $(MAKE) add-licenses
+	cd functions/ts && $(MAKE) add-licenses
+	cd contrib/functions/go && $(MAKE) add-licenses
+	cd contrib/functions/ts && $(MAKE) add-licenses
+
 verify-docs:
 	go install github.com/monopole/[email protected]
 	(cd scripts/patch_reader/ && go build -o patch_reader .)

README.md

@@ -5,14 +5,14 @@
 
 [Documentation]
 
-[Open an Issue]
-
 [Contributor Guide]
 
 [Release Process]
 
 [Code of Conduct]
 
+Please [open Issues](https://github.com/GoogleContainerTools/kpt/issues) for this repo at [GoogleContainerTools/kpt](https://github.com/GoogleContainerTools/kpt).
+
 [Documentation]: https://catalog.kpt.dev/
 [Contributor Guide]: CONTRIBUTING.md
 [Code of Conduct]: CODE_OF_CONDUCT.md

RELEASING.md

@@ -23,28 +23,38 @@ be created on the [releases pages]. `RELEASE_BRANCH` is in the form of
 `${FUNCTION_NAME}/v${MAJOR_VERSION}.${MINOR_VERSION}`.
 For example `set-namespace/v0.3`, `kubeval/v0.1`, etc.
 
-
-1. Run the script:
+1. Setup the release branch 
+	Release branch should have existed in the [upstream repo](https://github.com/GoogleContainerTools/kpt-functions-catalog) in the form of `<FUNCTION_NAME>/v<MAJOR>.<MINOR>`. Let's take `set-namespace/v0.4` as an example. You should replace that to your RELEASE_BRANCH.  
+	```shell
+	> export RELEASE_BRANCH=set-namespace/v0.4
+	```
+2. Clean up the local branch
+	The release script needs to run in the local <RELEASE BRANCH>. To avoid git ref conflicts, we suggest you delete your local branch OR make it up to date with the remote <RELEASE BRANCH>
+```shell
+> git branch -D ${RELEASE_BRANCH}
+```
+3. Fetch the upstream repository
+	Your `upstream` repo should point to the official kpt-functions-catalog. Verify your git remote is set as below
+```shell
+> git remote -v | grep upstream
+upstream	[email protected]:GoogleContainerTools/kpt-functions-catalog.git (fetch)
+upstream	[email protected]:GoogleContainerTools/kpt-functions-catalog.git (push)
+# Fetch the latest upstream repo
+> git fetch upstream
+```
+4. Run the doc updating script.
 ```shell
-# Fetch from upstream (assuming upstream is set to official repo)
-git fetch upstream
-# Make sure local release branch is up to date
-# e.g. git checkout set-namespace/v0.3 && git reset --hard upstream/set-namespace/v0.3
-git checkout <RELEASE_BRANCH> && git reset --hard upstream/<RELEASE_BRANCH>
-# Check out latest version of the make target from master
-git checkout upstream/master
-# Run the make target
-# e.g. RELEASE_BRANCH=set-namespace/v0.3 make update-function-docs
-RELEASE_BRANCH=<RELEASE_BRANCH> make update-function-docs
+git checkout remotes/upstream/master
+RELEASE_BRANCH=${RELEASE_BRANCH} make update-function-docs
 ```
-1. The script will generate a new commit in your local repository which updates
-the docs for the provided function release. Push this commit to your remote.
+5. Send out a Pull Request. 
+	Your local git reference is now pointing to the local RELEASE BRANCH.
+	A new git commit is auto-generated which contains the function document referring to the latest function version in the form of 
+	`<FUNCTION_NAME>/v<MAJOR>.<MINOR>.<PATCH>`
+	You should be ready to submit the Pull Request against the upstream <RELEASE_BRANCH>. 
 ```shell
-# Push the commit to your remote (branch name can be anything)
-# e.g. git push origin HEAD:update-docs-set-namespace
-git push origin HEAD:<remote-branch>
+> git push -f origin ${RELEASE_BRANCH}
 ```
-1. Create a pull request targeted at the release branch.
 
 [repo]: https://github.com/GoogleContainerTools/kpt-functions-catalog
 [releases pages]: https://github.com/GoogleContainerTools/kpt-functions-catalog/releases

build/docker/go/defaults.env

@@ -1,2 +1,2 @@
-BUILDER_IMAGE=golang:1.17-alpine3.15
+BUILDER_IMAGE=golang:1.18-alpine3.15
 BASE_IMAGE=alpine:3.15

build/docker/ts/defaults.env

@@ -1,3 +1,2 @@
 BUILDER_IMAGE=node:14.19-alpine3.15
-KUBEVAL_BUILDER_IMAGE=golang:1.17-alpine3.15
 BASE_IMAGE=node:14.19-alpine3.15

contrib/functions/go/Makefile

@@ -80,6 +80,10 @@ $(FUNCTION_PUSH):
 .PHONY: check-licenses
 check-licenses: install-go-licenses $(FUNCTION_CHECKLICENSES)
 
+add-licenses:
+	@echo Update license in path: contrib/functions/go
+	GOBIN=$(GOBIN) ../../../hack/update-license.sh
+
 .PHONY: $(FUNCTION_CHECKLICENSES)
 $(FUNCTION_CHECKLICENSES):
 	$(MAKE) CURRENT_FUNCTION=$(subst -CHECKLICENSES,,$@) func-check-licenses
@@ -131,4 +135,3 @@ func-push:
 
 docs-generate:
 	$(GOBIN)/mdtogo $(CURRENT_FUNCTION) $(CURRENT_FUNCTION)/generated --license=none --strategy=cmdDocs
-

contrib/functions/ts/Makefile

@@ -14,6 +14,7 @@
 SHELL=/bin/bash
 TAG ?= unstable
 GCR = gcr.io/kpt-fn-contrib
+GOBIN := $(shell go env GOPATH)/bin
 
 .DEFAULT_GOAL := help
 .PHONY: help
@@ -66,6 +67,10 @@ $(FUNCTION_PUSH):
 
 check-licenses: $(FUNCTION_CHECKLICENSES) ## Run license checker for source files
 
+add-licenses:
+	@echo Update license in path: contrib/functions/ts
+	GOBIN=$(GOBIN) ../../../hack/update-license.sh
+
 .PHONY: $(FUNCTION_CHECKLICENSES)
 $(FUNCTION_CHECKLICENSES):
 	$(MAKE) CURRENT_FUNCTION=$(subst -CHECKLICENSES,,$@) func-check-licenses