Skip to content

Commit a4dde6a

Browse files
authored
Merge pull request #28 from pfnet-research/bump-deps
Bump Go, dependencies, Actions
2 parents 3f8fe12 + ae9a648 commit a4dde6a

18 files changed

+8694
-9948
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
test:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-go@v3
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-go@v5
1717
with:
18-
go-version: "1.19"
18+
go-version-file: go.mod
1919
- run: make test
2020

2121
docker-build:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- run: make docker-build

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
run:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Login to GitHub Container Registry
16-
uses: docker/login-action@v2
16+
uses: docker/login-action@v3
1717
with:
1818
registry: ghcr.io
1919
username: ${{ github.actor }}

.github/workflows/tagpr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jobs:
88
tagpr:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- id: tagpr
1313
name: Tagpr
1414
uses: Songmu/tagpr@v1
1515
env:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1717

1818
- name: Trigger Release Workflow(only when tagged)
19-
uses: actions/github-script@v6
19+
uses: actions/github-script@v7
2020
if: "steps.tagpr.outputs.tag != ''"
2121
with:
2222
script: |

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19 AS base
1+
FROM golang:1.23 AS base
22

33
WORKDIR /workspace
44
# Copy the Go Modules manifests
@@ -8,7 +8,7 @@ COPY go.* .
88
RUN --mount=type=cache,target=/go/pkg/mod \
99
go mod download
1010

11-
FROM golangci/golangci-lint:v1.49 AS lint-base
11+
FROM golangci/golangci-lint:v1.64 AS lint-base
1212
FROM base AS lint
1313
RUN --mount=target=. \
1414
--mount=from=lint-base,src=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TAG := $(shell git describe --tags --always --dirty)
55
IMG ?= ghcr.io/pfnet-research/node-operation-controller:$(TAG)
66

77
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
8-
ENVTEST_K8S_VERSION = 1.25
8+
ENVTEST_K8S_VERSION = 1.30
99

1010
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
1111
ifeq (,$(shell go env GOBIN))
@@ -44,7 +44,7 @@ help: ## Display this help.
4444
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
4545

4646
CONTROLLER_GEN := $(CURDIR)/bin/controller-gen
47-
CONTROLLER_GEN_VERSION ?= v0.11.3
47+
CONTROLLER_GEN_VERSION ?= v0.16.5
4848
$(CONTROLLER_GEN): ## Download controller-gen locally if necessary.
4949
GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION)
5050

@@ -58,13 +58,13 @@ $(ENVTEST): ## Download envtest-setup locally if necessary.
5858
GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
5959

6060
KUBECTL := $(CURDIR)/bin/kubectl
61-
KUBECTL_VERSION ?= v1.26.1
61+
KUBECTL_VERSION ?= v1.30.11
6262
$(KUBECTL): ## Download kubectl locally if necessary.
6363
curl -Lo $(PROJECT_DIR)/bin/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl"
6464
chmod +x $(PROJECT_DIR)/bin/kubectl
6565

6666
KIND := $(CURDIR)/bin/kind
67-
KIND_VERSION ?= v0.17.0
67+
KIND_VERSION ?= v0.25.0
6868
$(KIND): ## Download kind locally if necessary.
6969
curl -Lo $(PROJECT_DIR)/bin/kind "https://kind.sigs.k8s.io/dl/${KIND_VERSION}/kind-linux-amd64"
7070
chmod +x $(PROJECT_DIR)/bin/kind

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/nodeops.k8s.preferred.jp_nodedisruptionbudgets.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.17.2
87
name: nodedisruptionbudgets.nodeops.k8s.preferred.jp
98
spec:
109
group: nodeops.k8s.preferred.jp
@@ -29,14 +28,19 @@ spec:
2928
API
3029
properties:
3130
apiVersion:
32-
description: 'APIVersion defines the versioned schema of this representation
33-
of an object. Servers should convert recognized schemas to the latest
34-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
31+
description: |-
32+
APIVersion defines the versioned schema of this representation of an object.
33+
Servers should convert recognized schemas to the latest internal value, and
34+
may reject unrecognized values.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3536
type: string
3637
kind:
37-
description: 'Kind is a string value representing the REST resource this
38-
object represents. Servers may infer this from the endpoint the client
39-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
38+
description: |-
39+
Kind is a string value representing the REST resource this object represents.
40+
Servers may infer this from the endpoint the client submits requests to.
41+
Cannot be updated.
42+
In CamelCase.
43+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4044
type: string
4145
metadata:
4246
type: object

0 commit comments

Comments
 (0)