From a4854c73a866db74e783fb743f16c417baf74905 Mon Sep 17 00:00:00 2001 From: ofan <319679+ofan@users.noreply.github.com> Date: Sun, 16 Jul 2023 15:20:41 +0000 Subject: [PATCH 01/14] kustomize: replace patchesStrategicMerge with patches kustomize v5.0.0 deprecated patchesStrategicMerge, it's renamed to patches. Normally it just gives a warning, tools like Argocd will treat this as error. https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patchesstrategicmerge/ Signed-off-by: Ryan Feng --- config/crd/kustomization.yaml | 2 +- config/manager-full/kustomization.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index dc303cd1..babd33dd 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -6,7 +6,7 @@ resources: - bases/samba-operator.samba.org_smbsecurityconfigs.yaml - bases/samba-operator.samba.org_smbcommonconfigs.yaml # +kubebuilder:scaffold:crdkustomizeresource -patchesStrategicMerge: +patches: # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix. # patches here are for enabling the conversion webhook for each CRD #- patches/webhook_in_smbshares.yaml diff --git a/config/manager-full/kustomization.yaml b/config/manager-full/kustomization.yaml index eaa0ee76..e58c92c4 100644 --- a/config/manager-full/kustomization.yaml +++ b/config/manager-full/kustomization.yaml @@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../manager -patchesStrategicMerge: +patches: # Protect the /metrics endpoint by putting it behind auth. # If you want your controller-manager to expose the /metrics # endpoint w/o any authn/z, please comment the following line. - - auth_proxy_patch.yaml + - path: auth_proxy_patch.yaml # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in # crd/kustomization.yaml From 080152c9de9a8c33fdd249762ce8347c6d84140d Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Tue, 25 Jul 2023 10:03:56 -0400 Subject: [PATCH 02/14] gitlint: ignore body lines that are footnotes Ignore lines that start like `[1]: ` or `[2] ` such that we can have long text like URLs in the commits without triggering other gitlint body rules. Copied from the same changes already made in samba-container (PR samba-in-kubernetes/samba-container#150). Signed-off-by: John Mulligan --- .gitlint | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlint b/.gitlint index abc756b6..d76f8eb0 100644 --- a/.gitlint +++ b/.gitlint @@ -30,6 +30,9 @@ ignore-merge-commits=true # Enable debug mode (prints more output). Disabled by default. # debug=true +# Enable search regex and remove warning message. +regex-style-search=true + # Enable community contributed rules # See http://jorisroovers.github.io/gitlint/contrib_rules for details # contrib=contrib-body-requires-signed-off-by @@ -106,11 +109,16 @@ regex=^.* # Use 'all' to ignore all rules # ignore=T1,body-min-length -# [ignore-body-lines] +[ignore-body-lines] # Ignore certain lines in a commit body that match a regex. # E.g. Ignore all lines that start with 'Co-Authored-By' # regex=^Co-Authored-By +# ignore lines that are "footnotes", that start like `[1]: ` or `[2]: ` and so on +# this will make it easy to put long urls in commit messages without +# triggering gitlint body rules +regex=^\[[0-9]+\]:? + + # This is a contrib rule - a community contributed rule. These are disabled by default. # You need to explicitly enable them one-by-one by adding them to the "contrib" option # under [general] section above. From 3e277c897629be805a275cd53d2dd8496646d47d Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Tue, 15 Aug 2023 18:47:05 +0530 Subject: [PATCH 03/14] go.mod: Bump Go version to 1.19 Signed-off-by: Anoop C S --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 66684a4f..9966b3f1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/samba-in-kubernetes/samba-operator -go 1.18 +go 1.19 require ( github.com/go-logr/logr v1.2.3 From 501ebe0f784121dc6610776fdbbbaba0d07accfb Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Tue, 15 Aug 2023 19:12:57 +0530 Subject: [PATCH 04/14] Dockerfile: Update base golang image to 1.19 Signed-off-by: Anoop C S --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 737e3de9..11115088 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM docker.io/golang:1.18 as builder +FROM docker.io/golang:1.19 as builder ARG GIT_VERSION="(unset)" ARG COMMIT_ID="(unset)" ARG ARCH="" From 016a4710449a8e8b6c116640f510e00f75e417b3 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Tue, 15 Aug 2023 18:45:13 +0530 Subject: [PATCH 05/14] github: Update setup-go action with Go 1.19 Signed-off-by: Anoop C S --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 75cc9bd3..7a86ede4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: "1.18" + go-version: "1.19" - uses: actions/checkout@v3 - name: Build run: make @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: "1.18" + go-version: "1.19" - uses: actions/checkout@v3 - name: Install revive run: go install github.com/mgechev/revive@latest @@ -46,7 +46,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: "1.18" + go-version: "1.19" - uses: actions/checkout@v3 - name: run the tests run: make test @@ -100,7 +100,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "1.18" + go-version: "1.19" - name: Install k3d run: curl -L --silent --fail "https://raw.githubusercontent.com/rancher/k3d/main/install.sh" | bash # The TAG env var can interfere with the k3d install script. From b588eb6dcdf05556c466bd3036aac1c6017a2471 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Tue, 15 Aug 2023 18:47:27 +0530 Subject: [PATCH 06/14] tests/centosci: Update mirrored golang image to 1.19 Signed-off-by: Anoop C S --- tests/centosci/sink-clustered-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/centosci/sink-clustered-deployment.sh b/tests/centosci/sink-clustered-deployment.sh index c5a2249f..37c9b0f0 100755 --- a/tests/centosci/sink-clustered-deployment.sh +++ b/tests/centosci/sink-clustered-deployment.sh @@ -13,7 +13,7 @@ setup_minikube deploy_rook -image_pull "${CI_IMG_REGISTRY}" "docker.io" "golang:1.18" +image_pull "${CI_IMG_REGISTRY}" "docker.io" "golang:1.19" # Build and push operator image to local CI registry IMG="${CI_IMG_OP}" make image-build From d28e94b24697d8c75036a5fadd91cfac84b9b75e Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Tue, 15 Aug 2023 18:45:53 +0530 Subject: [PATCH 07/14] docs: Update Go version references to 1.19 Signed-off-by: Anoop C S --- docs/CONTRIBUTING.md | 2 +- docs/developers-notes.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 80dcd1ca..64f47d9f 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -17,7 +17,7 @@ resources. Development effort takes place using Linux environment and requires at minimum: -1. [Go 1.18](https://golang.org/dl/) installed +1. [Go 1.19](https://golang.org/dl/) installed 2. [GitHub](https://github.com/) account 3. Development tools: git, make, and podman or docker 4. Testing: [minikube](https://minikube.sigs.k8s.io) diff --git a/docs/developers-notes.md b/docs/developers-notes.md index f2abb24c..c038a99c 100644 --- a/docs/developers-notes.md +++ b/docs/developers-notes.md @@ -4,7 +4,7 @@ ## Build from source The top-level [Makefile](../Makefile) is the entry point for various build -commands. The minimal required Go version is 1.18. A developer can verify the +commands. The minimal required Go version is 1.19. A developer can verify the build environment by running: ```bash From d448034dea81abee23dc704d0b48017cbd6c6929 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Thu, 23 Feb 2023 11:16:22 +0530 Subject: [PATCH 08/14] hack: Bump golang-ci-lint to v1.53.3 * Removes already deprecated[1] linter varcheck * Depguard now expects a list of allow/deny list and default rule is to allow only std lib in all files[2]. Therefore disable the linter. [1] https://golangci-lint.run/product/roadmap/#v1490 [2] https://github.com/golangci/golangci-lint/issues/3877#issuecomment-1573682848 Signed-off-by: Anoop C S --- .golangci.yaml | 2 -- hack/install-tools.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index ad237a80..5990ea04 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -6,7 +6,6 @@ linters: enable: - asciicheck # - deadcode - - depguard - dupl - errcheck - exhaustive @@ -37,7 +36,6 @@ linters: - unconvert # - unparam - unused - - varcheck - whitespace linters-settings: funlen: diff --git a/hack/install-tools.sh b/hack/install-tools.sh index 1e3bca9c..b2c4e8f7 100755 --- a/hack/install-tools.sh +++ b/hack/install-tools.sh @@ -44,7 +44,7 @@ _install_revive() { } _install_golangci_lint() { - _install_tool github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2 + _install_tool github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3 } _install_yq() { From 09f0fa06f9365dded87cad2c906f22724f951cdc Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Tue, 15 Aug 2023 10:33:52 -0400 Subject: [PATCH 09/14] workflows: use symbolic name oldstable instead of a particular version The actions/setup-go action has supported symbolic names of `stable` and `oldstable` for a bit. Instead of having to constantly update the workflow every time Go does a new release use the `oldstable` keyword in our workflow so that we're always testing with the older stable release of Go. We choose the older stable version because we do not want to accidentally introduce something new that requires a feature of the newer Go release. Signed-off-by: John Mulligan --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a86ede4..336a8af6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: "1.19" + go-version: oldstable - uses: actions/checkout@v3 - name: Build run: make @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: "1.19" + go-version: oldstable - uses: actions/checkout@v3 - name: Install revive run: go install github.com/mgechev/revive@latest @@ -46,7 +46,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: "1.19" + go-version: oldstable - uses: actions/checkout@v3 - name: run the tests run: make test @@ -100,7 +100,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "1.19" + go-version: oldstable - name: Install k3d run: curl -L --silent --fail "https://raw.githubusercontent.com/rancher/k3d/main/install.sh" | bash # The TAG env var can interfere with the k3d install script. From 1d9f821610e7d0aade0ff2c73e8fcd82091f44dd Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 23 Aug 2023 15:40:53 -0400 Subject: [PATCH 10/14] dockerfile: Update base golang image to 1.20 Go 1.20 was recently released so this gets us back on a supported golang version when building via the container. Signed-off-by: John Mulligan --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 11115088..032988ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM docker.io/golang:1.19 as builder +FROM docker.io/golang:1.20 as builder ARG GIT_VERSION="(unset)" ARG COMMIT_ID="(unset)" ARG ARCH="" From 778b210e5810ef0eb98980385adf1ba183186119 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 23 Aug 2023 15:42:35 -0400 Subject: [PATCH 11/14] hack: add go-version-check.sh script This script validates the Dockefile (or other specified container files) or shows the list of current supported golang version images. The goal is to ensure we are continually using a supported Go version and not falling behind. Signed-off-by: John Mulligan --- hack/go-version-check.sh | 113 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100755 hack/go-version-check.sh diff --git a/hack/go-version-check.sh b/hack/go-version-check.sh new file mode 100755 index 00000000..be8cd01b --- /dev/null +++ b/hack/go-version-check.sh @@ -0,0 +1,113 @@ +#!/bin/bash +# +# List or check that the golang version embedded in files (specifically our +# Dockerfile) is using a supported version of Go. +# Run with --show to list the images the script thinks are current. +# Run with --check (the default) to verify the Dockerfile contains a current +# image & version tag. +# + +set -e +SCRIPT_DIR="$(readlink -f "$(dirname "${0}")")" +PROJECT_DIR="$(readlink -f "${SCRIPT_DIR}/..")" +WORKDIR="$(mktemp -d)" +CONTAINER_FILES=("${PROJECT_DIR}/Dockerfile") +GOVERSURL='https://go.dev/dl/?mode=json' +ACTION=check + + +fetch_versions() { + local url="$1" + local out="$2" + if [ -f "${out}" ]; then + return + fi + echo "Fetching Go versions..." >&2 + curl --fail -sL -o "${out}" "${url}" +} + +extract_versions() { + local jsonfile="$1" + jq -r '.[].version' < "${jsonfile}" | \ + cut -d. -f1,2 | sort -u | sed -e 's,^go,,' +} + +to_images() { + for a in "$@"; do + echo "docker.io/golang:${a}" + done +} + +cleanup() { + # only used in trap, ignoe unreachable error + # shellcheck disable=SC2317 + rm -rf "${WORKDIR}" +} +trap cleanup EXIT + + +opts=$(getopt --name "$0" \ + -o "csf:" -l "check,show,file:,url:,versionsfile:" -- "$@") +eval set -- "$opts" + +cli_cfiles=() +while true ; do + case "$1" in + -c|--check) + ACTION=check + shift + ;; + -s|--show) + ACTION=show + shift + ;; + -f|--file) + cli_cfiles+=("$2") + shift 2 + ;; + --url) + GOVERSURL="$2" + shift 2 + ;; + --versionsfile) + GOVERSIONSFILE="$2" + shift 2 + ;; + --) + shift + break + ;; + *) + echo "unexpected option: $1" >&2 + exit 2 + ;; + esac +done + +if [ "${#cli_cfiles}" -gt 0 ]; then + CONTAINER_FILES=("${cli_cfiles[@]}") +fi + +GV="${GOVERSIONSFILE:-${WORKDIR}/go-versions.json}" +fetch_versions "${GOVERSURL}" "${GV}" +mapfile -t go_major_vers < <(extract_versions "${GV}") + +echo "Found Go versions:" "${go_major_vers[@]}" >&2 +if [ "${ACTION}" = show ]; then + to_images "${go_major_vers[@]}" + exit 1 +fi + +mapfile -t valid_images < <(to_images "${go_major_vers[@]}") +errors=0 +for cf in "${CONTAINER_FILES[@]}"; do + echo "Checking $cf ..." >&2 + if grep -q -e "${valid_images[0]}" -e "${valid_images[1]}" "${cf}" ; then + echo "${cf}: OK" >&2 + else + echo "${cf}: no current golang image found" >&2 + errors=1 + fi +done + +exit "${errors}" From ec7f4696aedc0076a52715e28a671fbec32b7d71 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 23 Aug 2023 15:49:09 -0400 Subject: [PATCH 12/14] makefile: add check-dockerfile-go-version Add a new check-dockerfile-go-version makefile target and include it in the check target. This runs the recently added script to validate the version of golang used to build in container. The downside of this approach is that PRs & other work unrelated to Golang may periodically break when Go issues a new major release. Let's try this for now and if it ends up getting really annoying we can try to do some other form of automation to alert us to the need of a version bump that doesn't interfere with unrelated work. Signed-off-by: John Mulligan --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b157b1f9..5141ec99 100644 --- a/Makefile +++ b/Makefile @@ -206,9 +206,9 @@ bundle-build: @false # See vcs history for how this could be restored or adapted in the future. -.PHONY: check check-revive check-golangci-lint check-format check-yaml check-gosec +.PHONY: check check-revive check-golangci-lint check-format check-yaml check-gosec check-dockerfile-go-version -check: check-revive check-golangci-lint check-format vet check-yaml check-gosec +check: check-revive check-golangci-lint check-format vet check-yaml check-gosec check-dockerfile-go-version check-format: ! $(GOFMT_CMD) $(CHECK_GOFMT_FLAGS) . | sed 's,^,formatting error: ,' | grep 'go$$' @@ -227,6 +227,10 @@ check-yaml: check-gosec: gosec $(GOSEC) -quiet -exclude=G101 -fmt json ./... +check-dockerfile-go-version: + # use go-version-check.sh --show to list vaild golang builder images + $(CURDIR)/hack/go-version-check.sh --check + check-gitlint: gitlint $(GITLINT) -C .gitlint --commits origin/master.. lint From 46e8d37e7c759698de380c0fefff4de7bad1a989 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:23:23 +0000 Subject: [PATCH 13/14] build(deps): bump golang.org/x/net from 0.7.0 to 0.17.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.7.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 9966b3f1..bb4f5003 100644 --- a/go.mod +++ b/go.mod @@ -59,11 +59,11 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/net v0.7.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 31a43c6d..02336dd1 100644 --- a/go.sum +++ b/go.sum @@ -618,8 +618,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -689,12 +689,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -703,8 +703,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 993a5ee7aaaed966e918e5a829bf8d1f30e7d8aa Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Tue, 28 Nov 2023 11:14:06 +0530 Subject: [PATCH 14/14] tests/centosci: Update mirrored golang image to 1.20 Signed-off-by: Anoop C S --- tests/centosci/sink-clustered-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/centosci/sink-clustered-deployment.sh b/tests/centosci/sink-clustered-deployment.sh index 37c9b0f0..b6370523 100755 --- a/tests/centosci/sink-clustered-deployment.sh +++ b/tests/centosci/sink-clustered-deployment.sh @@ -13,7 +13,7 @@ setup_minikube deploy_rook -image_pull "${CI_IMG_REGISTRY}" "docker.io" "golang:1.19" +image_pull "${CI_IMG_REGISTRY}" "docker.io" "golang:1.20" # Build and push operator image to local CI registry IMG="${CI_IMG_OP}" make image-build