From feac30e158dcd596a69027919815f161c8921be4 Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Thu, 12 Oct 2023 11:58:41 -0400 Subject: [PATCH 1/6] (chore): Bump Go version to 1.21 + regenerate testdata Signed-off-by: Bryce Palmer --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/integration.yml | 4 ++-- .github/workflows/test-go.yml | 8 ++++---- .github/workflows/test-helm.yml | 4 ++-- .github/workflows/test-sample-go.yml | 4 ++-- .github/workflows/test-sanity.yml | 4 ++-- go.mod | 2 +- go.sum | 9 +++++++++ testdata/go/v3/memcached-operator/Makefile | 2 +- testdata/go/v3/monitoring/memcached-operator/Makefile | 2 +- testdata/go/v4-alpha/memcached-operator/Makefile | 2 +- .../go/v4-alpha/monitoring/memcached-operator/Makefile | 2 +- testdata/helm/memcached-operator/Makefile | 2 +- 13 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a8067db28ce..9356e9fe516 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -44,9 +44,9 @@ jobs: fetch-depth: 0 - name: install - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" - name: gpg init if: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c15c7917643..ac22257ae59 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -26,9 +26,9 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml index 9d80f82dcca..4e6243e220a 100644 --- a/.github/workflows/test-go.yml +++ b/.github/workflows/test-go.yml @@ -29,9 +29,9 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -44,9 +44,9 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/test-helm.yml b/.github/workflows/test-helm.yml index b73743c9931..bf01a866e48 100644 --- a/.github/workflows/test-helm.yml +++ b/.github/workflows/test-helm.yml @@ -26,9 +26,9 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/test-sample-go.yml b/.github/workflows/test-sample-go.yml index 1ae85027e16..7fb7f10e6c1 100644 --- a/.github/workflows/test-sample-go.yml +++ b/.github/workflows/test-sample-go.yml @@ -26,9 +26,9 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/test-sanity.yml b/.github/workflows/test-sanity.yml index beaecc92ec6..5da8615ba2d 100644 --- a/.github/workflows/test-sanity.yml +++ b/.github/workflows/test-sanity.yml @@ -26,9 +26,9 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version-file: "go.mod" id: go - uses: actions/checkout@v3 with: diff --git a/go.mod b/go.mod index 276dd52dda8..d82513b4070 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/operator-framework/operator-sdk -go 1.19 +go 1.21 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/go.sum b/go.sum index 4de3e039454..8cea4f91242 100644 --- a/go.sum +++ b/go.sum @@ -60,6 +60,7 @@ github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= @@ -115,6 +116,7 @@ github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:W github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -203,6 +205,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= @@ -247,6 +250,7 @@ github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ= @@ -292,6 +296,7 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc= +github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -733,6 +738,7 @@ github.com/nelsam/hel/v2 v2.3.2/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy github.com/nelsam/hel/v2 v2.3.3/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy+rL3w= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -740,6 +746,7 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.7.0 h1:/XxtEV3I3Eif/HobnVx9YmJgk8ENdRsuUmM+fLCFNow= github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -1028,6 +1035,7 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= @@ -1612,6 +1620,7 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= +gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= helm.sh/helm/v3 v3.11.3 h1:n1X5yaQTP5DYywlBOZMl2gX398Gp6YwFp/IAVj6+5D4= helm.sh/helm/v3 v3.11.3/go.mod h1:S+sOdQc3BLvt09a9rSlKKVs9x0N/yx+No0y3qFw+FQ8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/testdata/go/v3/memcached-operator/Makefile b/testdata/go/v3/memcached-operator/Makefile index 8cfc9f6c0a2..cce000c2539 100644 --- a/testdata/go/v3/memcached-operator/Makefile +++ b/testdata/go/v3/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.31.0 +OPERATOR_SDK_VERSION ?= v1.32.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest diff --git a/testdata/go/v3/monitoring/memcached-operator/Makefile b/testdata/go/v3/monitoring/memcached-operator/Makefile index 42aaf68a298..98d67fce250 100644 --- a/testdata/go/v3/monitoring/memcached-operator/Makefile +++ b/testdata/go/v3/monitoring/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.31.0 +OPERATOR_SDK_VERSION ?= v1.32.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest diff --git a/testdata/go/v4-alpha/memcached-operator/Makefile b/testdata/go/v4-alpha/memcached-operator/Makefile index a7cce76d642..62105d9550e 100644 --- a/testdata/go/v4-alpha/memcached-operator/Makefile +++ b/testdata/go/v4-alpha/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.31.0 +OPERATOR_SDK_VERSION ?= v1.32.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest diff --git a/testdata/go/v4-alpha/monitoring/memcached-operator/Makefile b/testdata/go/v4-alpha/monitoring/memcached-operator/Makefile index 7c598cd3b63..82e0ad54d1f 100644 --- a/testdata/go/v4-alpha/monitoring/memcached-operator/Makefile +++ b/testdata/go/v4-alpha/monitoring/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.31.0 +OPERATOR_SDK_VERSION ?= v1.32.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest diff --git a/testdata/helm/memcached-operator/Makefile b/testdata/helm/memcached-operator/Makefile index b7616421ec1..a8348ff4e11 100644 --- a/testdata/helm/memcached-operator/Makefile +++ b/testdata/helm/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.31.0 +OPERATOR_SDK_VERSION ?= v1.32.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest From 4030cc051a3f7c5695e617da82c8eb7e4c45a85b Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Thu, 12 Oct 2023 12:08:00 -0400 Subject: [PATCH 2/6] fix ordering of go setup and checkout Signed-off-by: Bryce Palmer --- .github/workflows/test-go.yml | 12 ++++++------ .github/workflows/test-helm.yml | 6 +++--- .github/workflows/test-sample-go.yml | 6 +++--- .github/workflows/test-sanity.yml | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml index 4e6243e220a..08a28f166c5 100644 --- a/.github/workflows/test-go.yml +++ b/.github/workflows/test-go.yml @@ -29,12 +29,12 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v4 - with: - go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-go@v4 + with: + go-version-file: "go.mod" - run: sudo rm -rf /usr/local/bin/kustomize - run: make test-e2e-go @@ -44,12 +44,12 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v4 - with: - go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-go@v4 + with: + go-version-file: "go.mod" - run: make test-unit - uses: shogo82148/actions-goveralls@v1 with: diff --git a/.github/workflows/test-helm.yml b/.github/workflows/test-helm.yml index bf01a866e48..ab2775347b1 100644 --- a/.github/workflows/test-helm.yml +++ b/.github/workflows/test-helm.yml @@ -26,11 +26,11 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v4 - with: - go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-go@v4 + with: + go-version-file: "go.mod" - run: sudo rm -rf /usr/local/bin/kustomize - run: make test-e2e-helm diff --git a/.github/workflows/test-sample-go.yml b/.github/workflows/test-sample-go.yml index 7fb7f10e6c1..8f271a533ed 100644 --- a/.github/workflows/test-sample-go.yml +++ b/.github/workflows/test-sample-go.yml @@ -26,11 +26,11 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v4 - with: - go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-go@v4 + with: + go-version-file: "go.mod" - run: sudo rm -rf /usr/local/bin/kustomize - run: make test-e2e-sample-go diff --git a/.github/workflows/test-sanity.yml b/.github/workflows/test-sanity.yml index 5da8615ba2d..e7e30e2dd6b 100644 --- a/.github/workflows/test-sanity.yml +++ b/.github/workflows/test-sanity.yml @@ -26,13 +26,13 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 - uses: actions/setup-go@v4 with: go-version-file: "go.mod" id: go - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - run: sudo rm -rf /usr/local/bin/kustomize - run: make test-sanity From c4e2077e162a568ffd2aa044a557668aecd7edc2 Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Thu, 12 Oct 2023 12:13:20 -0400 Subject: [PATCH 3/6] fix ordering of go setup and checkout of missed one Signed-off-by: Bryce Palmer --- .github/workflows/integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index ac22257ae59..592b0a946e2 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -26,10 +26,10 @@ jobs: needs: check_docs_only if: needs.check_docs_only.outputs.skip != 'true' steps: - - uses: actions/setup-go@v4 - with: - go-version-file: "go.mod" - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-go@v4 + with: + go-version-file: "go.mod" - run: make test-e2e-integration From e46560d58268e7a67743215798c5ec29cf28827f Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Thu, 12 Oct 2023 12:30:16 -0400 Subject: [PATCH 4/6] bump image builder go version Signed-off-by: Bryce Palmer --- images/custom-scorecard-tests/Dockerfile | 2 +- images/helm-operator/Dockerfile | 2 +- images/operator-sdk/Dockerfile | 2 +- images/scorecard-test-kuttl/Dockerfile | 2 +- images/scorecard-test/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/custom-scorecard-tests/Dockerfile b/images/custom-scorecard-tests/Dockerfile index 1faf1618194..df1410c3c55 100644 --- a/images/custom-scorecard-tests/Dockerfile +++ b/images/custom-scorecard-tests/Dockerfile @@ -1,5 +1,5 @@ # Build the custom-scorecard-tests binary -FROM --platform=$BUILDPLATFORM golang:1.19 as builder +FROM --platform=$BUILDPLATFORM golang:1.21 as builder ARG TARGETARCH WORKDIR /workspace diff --git a/images/helm-operator/Dockerfile b/images/helm-operator/Dockerfile index 3293fb2acdf..bfd98daa897 100644 --- a/images/helm-operator/Dockerfile +++ b/images/helm-operator/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.19 as builder +FROM --platform=$BUILDPLATFORM golang:1.21 as builder ARG TARGETARCH WORKDIR /workspace diff --git a/images/operator-sdk/Dockerfile b/images/operator-sdk/Dockerfile index 785a0f12685..f1137b10130 100644 --- a/images/operator-sdk/Dockerfile +++ b/images/operator-sdk/Dockerfile @@ -1,5 +1,5 @@ # Build the operator-sdk binary -FROM --platform=$BUILDPLATFORM golang:1.19 as builder +FROM --platform=$BUILDPLATFORM golang:1.21 as builder ARG TARGETARCH WORKDIR /workspace diff --git a/images/scorecard-test-kuttl/Dockerfile b/images/scorecard-test-kuttl/Dockerfile index 559c7a73365..0c4f9d81d4c 100644 --- a/images/scorecard-test-kuttl/Dockerfile +++ b/images/scorecard-test-kuttl/Dockerfile @@ -1,5 +1,5 @@ # Build the scorecard-test-kuttl binary -FROM --platform=$BUILDPLATFORM golang:1.19 as builder +FROM --platform=$BUILDPLATFORM golang:1.21 as builder ARG TARGETARCH ARG BUILDPLATFORM diff --git a/images/scorecard-test/Dockerfile b/images/scorecard-test/Dockerfile index e2bfd3422b2..be4f3772df5 100644 --- a/images/scorecard-test/Dockerfile +++ b/images/scorecard-test/Dockerfile @@ -1,5 +1,5 @@ # Build the scorecard-test binary -FROM --platform=$BUILDPLATFORM golang:1.19 as builder +FROM --platform=$BUILDPLATFORM golang:1.21 as builder ARG TARGETARCH WORKDIR /workspace From dbcfc8caf61f00623da2698f56117f127ba3242d Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Thu, 12 Oct 2023 12:32:18 -0400 Subject: [PATCH 5/6] bump go version in docs Signed-off-by: Bryce Palmer --- .../content/en/docs/building-operators/golang/installation.md | 2 +- website/content/en/docs/installation/_index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/en/docs/building-operators/golang/installation.md b/website/content/en/docs/building-operators/golang/installation.md index f483035cde1..70f8be52f5b 100644 --- a/website/content/en/docs/building-operators/golang/installation.md +++ b/website/content/en/docs/building-operators/golang/installation.md @@ -11,7 +11,7 @@ Follow the steps in the [installation guide][install-guide] to learn how to inst ## Additional Prerequisites - [git][git_tool] -- [go][go_tool] version 1.19 +- [go][go_tool] version 1.21 - [docker][docker_tool] version 17.03+. - [kubectl][kubectl_tool] and access to a Kubernetes cluster of a [compatible version][k8s-version-compat]. diff --git a/website/content/en/docs/installation/_index.md b/website/content/en/docs/installation/_index.md index 6cc6cfd32bc..cf035493b5b 100644 --- a/website/content/en/docs/installation/_index.md +++ b/website/content/en/docs/installation/_index.md @@ -88,7 +88,7 @@ chmod +x operator-sdk_${OS}_${ARCH} && sudo mv operator-sdk_${OS}_${ARCH} /usr/l #### Prerequisites - [git][git_tool] -- [go][go_tool] version 1.19 +- [go][go_tool] version 1.21 - Ensure that your `GOPROXY` is set to `"https://proxy.golang.org|direct"` ```sh From a3dcccad094415bb6b9ca99594f5e62651882f10 Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Thu, 12 Oct 2023 14:47:37 -0400 Subject: [PATCH 6/6] bump go version in contributing guide Signed-off-by: Bryce Palmer --- .../content/en/docs/contribution-guidelines/developer-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/docs/contribution-guidelines/developer-guide.md b/website/content/en/docs/contribution-guidelines/developer-guide.md index cb47da034bc..6fb57e7d78f 100644 --- a/website/content/en/docs/contribution-guidelines/developer-guide.md +++ b/website/content/en/docs/contribution-guidelines/developer-guide.md @@ -9,7 +9,7 @@ weight: 1 ### Prerequisites - [git][git-tool] -- [go][go-tool] version 1.19 +- [go][go-tool] version 1.21 ### Download Operator SDK