Skip to content

Commit 2873a1b

Browse files
authored
update golang to 1.20.5 and go mod tidy (#268)
* update golang to 1.20.5 and go mod tidy * update changelog * update build image in CI config * update netcat install
1 parent bfebbe8 commit 2873a1b

File tree

6 files changed

+5
-6
lines changed

6 files changed

+5
-6
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ orbs:
3131
executors:
3232
operator-build:
3333
docker:
34-
- image: ghcr.io/konpyutaika/docker-images/nifikop-build:1.20
34+
- image: ghcr.io/konpyutaika/docker-images/nifikop-build:1.20.5
3535
# Define jobs list
3636
jobs:
3737
# Build job, which build operator docker image (with operator-sdk build)

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
- [PR #257](https://github.com/konpyutaika/nifikop/pull/257) - **[Operator]** Updated the operator-sdk to 1.28.0.
1010
- [PR #263](https://github.com/konpyutaika/nifikop/pull/263) - **[NiGoApi]** Upgrade nigoapi to v0.0.8.
11+
- [PR #263](https://github.com/konpyutaika/nifikop/pull/268) - **[Operator]** Upgrade golang to 1.20.5.
1112

1213
### Fixed Bugs
1314

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.20 as builder
2+
FROM golang:1.20.5 as builder
33

44
WORKDIR /workspace
55

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DOCKER_REGISTRY_BASE ?= ghcr.io/konpyutaika/docker-images
44
IMAGE_TAG ?= $(shell git describe --tags --abbrev=0 --match '[0-9].*[0-9].*[0-9]' 2>/dev/null)
55
IMAGE_NAME ?= $(SERVICE_NAME)
66
BUILD_IMAGE ?= ghcr.io/konpyutaika/docker-images/nifikop-build
7-
GOLANG_VERSION ?= 1.20
7+
GOLANG_VERSION ?= 1.20.5
88
IMAGE_TAG_BASE ?= <registry>/<operator name>
99
OS = $(shell go env GOOS)
1010
ARCH = $(shell go env GOARCH)

docker/build-image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN apt-get update \
3232
&& apt-get install -y \
3333
git apt \
3434
locales sudo openssh-client ca-certificates tar gzip \
35-
net-tools netcat unzip zip bzip2 gnupg curl wget
35+
net-tools netcat-traditional unzip zip bzip2 gnupg curl wget
3636

3737
# Set timezone to UTC by default
3838
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
140140
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
141141
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
142142
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
143-
github.com/konpyutaika/nigoapi v0.0.6 h1:tyzs05rJ1DVbwb3zhdtV/T4k8tfRkAPaydZOGfQFSL0=
144-
github.com/konpyutaika/nigoapi v0.0.6/go.mod h1:ylinFOIwDzQvM+BbiDFWmr6l2Lexs2pg/jb9znIVAv4=
145143
github.com/konpyutaika/nigoapi v0.0.8 h1:eOp5Bj7v3PStEqmQrqETncyi5ZRg9k0ooEIZAp71GbU=
146144
github.com/konpyutaika/nigoapi v0.0.8/go.mod h1:ylinFOIwDzQvM+BbiDFWmr6l2Lexs2pg/jb9znIVAv4=
147145
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

0 commit comments

Comments
 (0)