Skip to content

Commit 83deb06

Browse files
authored
go1.18 support (#131)
* go1.18 support * go1.18 in dockerfile and bump versions Co-authored-by: andrey.klyuev <andrey.klyuev@vk.team>
1 parent 2294538 commit 83deb06

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v1
2727

28-
- name: Set up Go 1.17
28+
- name: Set up Go 1.18
2929
uses: actions/setup-go@v1
3030
with:
31-
go-version: 1.17
31+
go-version: 1.18
3232
id: go
3333

3434
- name: Set up Kubebuilder

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.16 as builder
2+
FROM golang:1.18 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Makefile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 0.0.9
6+
VERSION ?= 0.0.11
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -168,26 +168,29 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
168168

169169
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
170170
controller-gen: ## Download controller-gen locally if necessary.
171-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
171+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen,v0.7.0)
172172

173173
KUSTOMIZE = $(shell pwd)/bin/kustomize
174174
kustomize: ## Download kustomize locally if necessary.
175-
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
175+
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3,v3.10.0)
176176

177177
ENVTEST = $(shell pwd)/bin/setup-envtest
178178
envtest: ## Download envtest-setup locally if necessary.
179-
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
179+
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest,latest)
180180

181-
# go-get-tool will 'go get' any package $2 and install it to $1.
181+
# go-get-tool will 'go get' any package $2 in version $3 and install it to $1.
182182
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
183183
define go-get-tool
184184
@[ -f $(1) ] || { \
185185
set -e ;\
186186
TMP_DIR=$$(mktemp -d) ;\
187187
cd $$TMP_DIR ;\
188188
go mod init tmp ;\
189-
echo "Downloading $(2)" ;\
190-
GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
189+
echo "Downloading $(2)@$(3)" ;\
190+
GO_VERSION=`go version | { read _ _ v _; echo $${v#go}; }` ; \
191+
GOBIN=$(PROJECT_DIR)/bin go get $(2)@$(3) ; \
192+
echo "Go version is $$GO_VERSION" ; \
193+
(printf '%s\n%s\n' "1.18" $$GO_VERSION | sort --check=quiet --version-sort) && GOBIN=$(PROJECT_DIR)/bin go install $(2) ; \
191194
rm -rf $$TMP_DIR ;\
192195
}
193196
endef

helm-charts/tarantool-cartridge/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v1
22
appVersion: "1.0"
33
description: A Helm chart for tarantool
44
name: cartridge
5-
version: 0.0.10
5+
version: 0.0.11

helm-charts/tarantool-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: kubernetes tarantool operator
55
type: application
66

77
# Helm chart Version
8-
version: 0.0.10
8+
version: 0.0.11
99

1010
# Application version to be deployed
1111
appVersion: 1.16.0

helm-charts/tarantool-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
image:
66
repository: tarantool/tarantool-operator
7-
tag: 0.0.10
7+
tag: 0.0.11
88
pullPolicy: IfNotPresent

0 commit comments

Comments
 (0)