From 1fd3ee5deb17cdc98763dca54412c8766cdfbbfe Mon Sep 17 00:00:00 2001 From: sethiyash Date: Mon, 29 May 2023 23:02:43 +0530 Subject: [PATCH 1/4] Bumping Go version to 1.20.4 Signed-off-by: sethiyash --- .github/workflows/benchmark-action.yaml | 2 +- .github/workflows/dependency-updater.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/release-process.yml | 2 +- .github/workflows/test-gh.yml | 2 +- .github/workflows/test-kctrl-gh.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- .github/workflows/upgrade-testing.yml | 2 +- Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/benchmark-action.yaml b/.github/workflows/benchmark-action.yaml index 7eadb6561..3eba1a5ca 100644 --- a/.github/workflows/benchmark-action.yaml +++ b/.github/workflows/benchmark-action.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v3.3.0 - uses: actions/setup-go@v3 # default version of go is 1.10 with: - go-version: "1.20.3" + go-version: 1.20.4 - name: Install Carvel Tools run: ./hack/install-deps.sh # Run benchmark with `go test -bench` and stores the output to a file diff --git a/.github/workflows/dependency-updater.yml b/.github/workflows/dependency-updater.yml index 922a32155..34eca5a42 100644 --- a/.github/workflows/dependency-updater.yml +++ b/.github/workflows/dependency-updater.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.20.3" + go-version: 1.20.4 - name: Update Dependencies File run: go run ./hack/dependencies.go update - name: Create Pull Request diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index a5f266ec9..dd7402860 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.20.3" + go-version: 1.20.4 - uses: actions/checkout@v3.5.2 with: fetch-depth: '0' diff --git a/.github/workflows/release-process.yml b/.github/workflows/release-process.yml index 8949a14a8..de2092758 100644 --- a/.github/workflows/release-process.yml +++ b/.github/workflows/release-process.yml @@ -35,7 +35,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.20.3" + go-version: 1.20.4 - name: Run release script run: | diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml index b4e36ca1b..0005aeafc 100644 --- a/.github/workflows/test-gh.yml +++ b/.github/workflows/test-gh.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.20.3" + go-version: 1.20.4 - name: Check out code uses: actions/checkout@v3.3.0 with: diff --git a/.github/workflows/test-kctrl-gh.yml b/.github/workflows/test-kctrl-gh.yml index bc97b1707..bf6bb8edb 100644 --- a/.github/workflows/test-kctrl-gh.yml +++ b/.github/workflows/test-kctrl-gh.yml @@ -24,7 +24,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.20.3" + go-version: 1.20.4 - name: Check out code uses: actions/checkout@v3.3.0 with: diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index eb48379cb..e016a0f99 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -70,7 +70,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.20.3" + go-version: 1.20.4 - name: Build the kapp-controller artifacts run: | ./hack/install-deps.sh diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml index 28a346f7f..c5149b48a 100644 --- a/.github/workflows/upgrade-testing.yml +++ b/.github/workflows/upgrade-testing.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.20.3" + go-version: 1.20.4 - name: Check out code uses: actions/checkout@v3.3.0 - name: Install Carvel Tools diff --git a/Dockerfile b/Dockerfile index d1ec6ef48..aaa6b0dd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.20.3 AS deps +FROM --platform=$BUILDPLATFORM golang:1.20.4 AS deps ARG TARGETOS TARGETARCH KCTRL_VER=development WORKDIR /workspace From 1d2311c2b956b314aceb01f06dfaa6e03a066dc0 Mon Sep 17 00:00:00 2001 From: sethiyash Date: Mon, 12 Jun 2023 12:02:49 +0530 Subject: [PATCH 2/4] Bumping go version to 1.20.5 Signed-off-by: sethiyash --- .github/workflows/benchmark-action.yaml | 2 +- .github/workflows/dependency-updater.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/release-process.yml | 2 +- .github/workflows/test-gh.yml | 2 +- .github/workflows/test-kctrl-gh.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- .github/workflows/upgrade-testing.yml | 2 +- Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/benchmark-action.yaml b/.github/workflows/benchmark-action.yaml index 3eba1a5ca..3796f0fa1 100644 --- a/.github/workflows/benchmark-action.yaml +++ b/.github/workflows/benchmark-action.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v3.3.0 - uses: actions/setup-go@v3 # default version of go is 1.10 with: - go-version: 1.20.4 + go-version: 1.20.5 - name: Install Carvel Tools run: ./hack/install-deps.sh # Run benchmark with `go test -bench` and stores the output to a file diff --git a/.github/workflows/dependency-updater.yml b/.github/workflows/dependency-updater.yml index 34eca5a42..c5b1ceee3 100644 --- a/.github/workflows/dependency-updater.yml +++ b/.github/workflows/dependency-updater.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: 1.20.4 + go-version: 1.20.5 - name: Update Dependencies File run: go run ./hack/dependencies.go update - name: Create Pull Request diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index dd7402860..08d599b59 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: 1.20.4 + go-version: 1.20.5 - uses: actions/checkout@v3.5.2 with: fetch-depth: '0' diff --git a/.github/workflows/release-process.yml b/.github/workflows/release-process.yml index de2092758..4ac215c26 100644 --- a/.github/workflows/release-process.yml +++ b/.github/workflows/release-process.yml @@ -35,7 +35,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: 1.20.4 + go-version: 1.20.5 - name: Run release script run: | diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml index 0005aeafc..2e178fbff 100644 --- a/.github/workflows/test-gh.yml +++ b/.github/workflows/test-gh.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: 1.20.4 + go-version: 1.20.5 - name: Check out code uses: actions/checkout@v3.3.0 with: diff --git a/.github/workflows/test-kctrl-gh.yml b/.github/workflows/test-kctrl-gh.yml index bf6bb8edb..455a3230c 100644 --- a/.github/workflows/test-kctrl-gh.yml +++ b/.github/workflows/test-kctrl-gh.yml @@ -24,7 +24,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: 1.20.4 + go-version: 1.20.5 - name: Check out code uses: actions/checkout@v3.3.0 with: diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index e016a0f99..d2338b0ff 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -70,7 +70,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: 1.20.4 + go-version: 1.20.5 - name: Build the kapp-controller artifacts run: | ./hack/install-deps.sh diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml index c5149b48a..272c4569c 100644 --- a/.github/workflows/upgrade-testing.yml +++ b/.github/workflows/upgrade-testing.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: 1.20.4 + go-version: 1.20.5 - name: Check out code uses: actions/checkout@v3.3.0 - name: Install Carvel Tools diff --git a/Dockerfile b/Dockerfile index aaa6b0dd4..20400f917 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.20.4 AS deps +FROM --platform=$BUILDPLATFORM golang:1.20.5 AS deps ARG TARGETOS TARGETARCH KCTRL_VER=development WORKDIR /workspace From 238da27162b75c050b2b7366be38a0d72476aa73 Mon Sep 17 00:00:00 2001 From: sethiyash Date: Tue, 13 Jun 2023 18:33:59 +0530 Subject: [PATCH 3/4] Bumping dependencies for KC v0.45.2 Signed-off-by: sethiyash --- hack/dependencies.yml | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/hack/dependencies.yml b/hack/dependencies.yml index 18f007fd5..97e05e6c5 100644 --- a/hack/dependencies.yml +++ b/hack/dependencies.yml @@ -1,57 +1,57 @@ - checksums: darwin: - amd64: 1c9a0167b4d0d92e112fc817273c7e168f8c8b0ef9a4040bd7695add1d0c7df6 + amd64: a21a6e45f92ae71eae95e771bb8da6e939593c6679d3da36c4ae2204afdcce5f linux: - amd64: 01606d885cdbce02340faadc29a83b5415280bc610e7cff3f639385d8f504aea - arm64: e5112e7c69c4e664d245a5482fad95f07b49b04c77c7b2c86f1eab86d294817a + amd64: a6729fb8514f10ab58f9ed3b50cd90ef79bf16d1cb29173baa84e1af0bc5ad4f + arm64: b0068b729e6787d0e6093ceb5678f5882d1ea2d56d75895e91f2082f64e588c5 dev: true name: ytt repo: vmware-tanzu/carvel-ytt urlTemplate: https://github.com/vmware-tanzu/carvel-{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}} - version: v0.45.1 + version: v0.45.3 - checksums: darwin: - amd64: 9e498c719bc3ae60e299e2be7b8f349d58c546d5346d20806564fa0782d07ba1 + amd64: 2503d10022133005f03ae0f5a7ee46460799f6d7950c2967423820b4acbcdc5f linux: - amd64: f32fb1251fcbb70d192542105044c5291c6e67fbca7fb467bf0d38d92b9bf204 - arm64: fdc36ff10798d86b42c8e52314e4721bd032ea46530e7511d77ed6fca72c1d99 + amd64: 814dbd68282717481db7bd99e56cc3f6ff0664880daf880aa44c88ff10d9588b + arm64: 9867106fb543f10135c29986bea8256ed2d6a76b00faff02453a9c932c84e589 dev: true name: kbld repo: vmware-tanzu/carvel-kbld urlTemplate: https://github.com/vmware-tanzu/carvel-{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}} - version: v0.37.1 + version: v0.37.4 - checksums: darwin: - amd64: 0de2a779052772f827fb832fe15f2738c9cacacbb97016426603d885026e8fbb + amd64: 1034fbe76db73bcafa9692b8eac0d251f53ac942a9e2719e6bf45f08bfedc9b8 linux: - amd64: 7a6f311a464d6e6331cc5ea93e1b6201875e259b2d1ed2b5a5b5798402c35fba - arm64: c017130cf75ba4e0d1a7ca8adff4dd4dcdff639ea241206b9d2c2dcefcffa764 + amd64: dfa37381cdc92517d037dba92acd03bb1a7ebd9b106f2a701dacdfa179a26e9a + arm64: 296e38e56665fad86f64ed99118ee008557871dd4dfdb94e9c5899acc69ce8b2 dev: true name: kapp repo: vmware-tanzu/carvel-kapp urlTemplate: https://github.com/vmware-tanzu/carvel-{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}} - version: v0.55.1 + version: v0.55.2 - checksums: darwin: - amd64: b70f3122892fde1d3e1b2dbf9ec25d2c3a00616741a9d9a38fa853023e9e9671 + amd64: fd7e0a30abb543cbcf9c5e24a63a717aef60324c8095b1bc23fb2a7f2f469bdd linux: - amd64: 2cc8f8db317685f7d270264712bb31efbfde14e95b065f31cd1e2d8c9eeb2d34 - arm64: 8ed6efef4233ad226c3301f381d4341a096518b7b445fc7e418ed10ed7434159 + amd64: 2e101164c7dea3506937c05457b60f0b3f346bc0a4ce6f4f9a285842d76994b8 + arm64: 7256a7ec34e75596387fddd88ddd1cded4bde6a58153ebedd1a1bdf4dbe66dee dev: true name: vendir repo: vmware-tanzu/carvel-vendir urlTemplate: https://github.com/vmware-tanzu/carvel-{{.Name}}/releases/download/{{.Version}}/{{.Name}}-{{.OS}}-{{.Arch}} - version: v0.33.2 + version: v0.33.3 - checksums: linux: - amd64: ca2d5d40d4cdfb9a3a6205dd803b5bc8def00bd2f13e5526c127e9b667974a89 - arm64: 9f58e707dcbe9a3b7885c4e24ef57edfb9794490d72705b33a93fa1f3572cce4 + amd64: da36e117d6dbc57c8ec5bab2283222fbd108db86c83389eebe045ad1ef3e2c3b + arm64: 658839fed8f9be2169f5df68e55cb2f0aa731a50df454caf183186766800bbd0 dev: false name: helm repo: helm/helm tarballSubpath: '{{.OS}}-{{.Arch}}/helm' urlTemplate: https://get.helm.sh/helm-{{.Version}}-{{.OS}}-{{.Arch}}.tar.gz - version: v3.11.3 + version: v3.12.0 - checksums: linux: amd64: 53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb @@ -73,11 +73,11 @@ version: v1.1.1 - checksums: linux: - amd64: 5e7ecb614b5926acfc36eb1258800391ab7c6e6e026fa7cacbfe92006bac895c - arm64: a8c3f4140d18c324cc69f5de4df0566e529e1636cff340095a42475799bf3fed + amd64: 38c9a2f484076aeafd9f522efdee40538c31337539bd8c80a29f5c4077314e53 + arm64: 735fa1b9bb02ef0ee79dd40c418760687776b44747f43f2e26c3bca4e1fd96f6 dev: false name: cue repo: cue-lang/cue tarballSubpath: cue urlTemplate: https://github.com/cue-lang/cue/releases/download/{{.Version}}/cue_{{.Version}}_{{.OS}}_{{.Arch}}.tar.gz - version: v0.4.3 + version: v0.5.0 From 951c182fec1f3ee8592e38c7dd810ae0dad79e1c Mon Sep 17 00:00:00 2001 From: sethiyash Date: Tue, 13 Jun 2023 19:36:16 +0530 Subject: [PATCH 4/4] Reverting helm and cue changes Signed-off-by: sethiyash --- hack/dependencies.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hack/dependencies.yml b/hack/dependencies.yml index 97e05e6c5..95ae68914 100644 --- a/hack/dependencies.yml +++ b/hack/dependencies.yml @@ -44,14 +44,14 @@ version: v0.33.3 - checksums: linux: - amd64: da36e117d6dbc57c8ec5bab2283222fbd108db86c83389eebe045ad1ef3e2c3b - arm64: 658839fed8f9be2169f5df68e55cb2f0aa731a50df454caf183186766800bbd0 + amd64: ca2d5d40d4cdfb9a3a6205dd803b5bc8def00bd2f13e5526c127e9b667974a89 + arm64: 9f58e707dcbe9a3b7885c4e24ef57edfb9794490d72705b33a93fa1f3572cce4 dev: false name: helm repo: helm/helm tarballSubpath: '{{.OS}}-{{.Arch}}/helm' urlTemplate: https://get.helm.sh/helm-{{.Version}}-{{.OS}}-{{.Arch}}.tar.gz - version: v3.12.0 + version: v3.11.3 - checksums: linux: amd64: 53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb @@ -73,11 +73,11 @@ version: v1.1.1 - checksums: linux: - amd64: 38c9a2f484076aeafd9f522efdee40538c31337539bd8c80a29f5c4077314e53 - arm64: 735fa1b9bb02ef0ee79dd40c418760687776b44747f43f2e26c3bca4e1fd96f6 + amd64: 5e7ecb614b5926acfc36eb1258800391ab7c6e6e026fa7cacbfe92006bac895c + arm64: a8c3f4140d18c324cc69f5de4df0566e529e1636cff340095a42475799bf3fed dev: false name: cue repo: cue-lang/cue tarballSubpath: cue urlTemplate: https://github.com/cue-lang/cue/releases/download/{{.Version}}/cue_{{.Version}}_{{.OS}}_{{.Arch}}.tar.gz - version: v0.5.0 + version: v0.4.3