Skip to content

Commit 5385a23

Browse files
authored
Merge pull request #27 from cybozu-go/support-k8s-1.26
2 parents 7a923c0 + 5abcc12 commit 5385a23

15 files changed

Lines changed: 83 additions & 496 deletions

.github/workflows/ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
build:
1111
name: Build
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
steps:
1414
- uses: actions/checkout@v3
1515
- name: Setup go
@@ -20,7 +20,7 @@ jobs:
2020
run: make build
2121
lint:
2222
name: Lint
23-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-22.04
2424
steps:
2525
- uses: actions/checkout@v3
2626
- uses: actions/setup-python@v4
@@ -34,7 +34,7 @@ jobs:
3434
run: make lint
3535
check-goreleaser-config:
3636
name: Check goreleaser.yml
37-
runs-on: ubuntu-20.04
37+
runs-on: ubuntu-22.04
3838
steps:
3939
- uses: actions/checkout@v3
4040
- name: Setup go
@@ -47,7 +47,7 @@ jobs:
4747
args: check -f .goreleaser.yml
4848
test:
4949
name: Test
50-
runs-on: ubuntu-20.04
50+
runs-on: ubuntu-22.04
5151
steps:
5252
- uses: actions/checkout@v3
5353
- name: Setup go
@@ -60,8 +60,8 @@ jobs:
6060
name: End-to-End Tests
6161
strategy:
6262
matrix:
63-
k8s-version: ["1.23.13", "1.24.7", "1.25.3"]
64-
runs-on: ubuntu-20.04
63+
k8s-version: ["1.24.12", "1.25.8", "1.26.3"]
64+
runs-on: ubuntu-22.04
6565
steps:
6666
- uses: actions/checkout@v3
6767
- uses: actions/setup-go@v3
@@ -81,7 +81,7 @@ jobs:
8181
path: e2e/logs.tar.gz
8282
dry-run:
8383
name: Dry-run release
84-
runs-on: ubuntu-20.04
84+
runs-on: ubuntu-22.04
8585
steps:
8686
- name: Checkout
8787
uses: actions/checkout@v3

.github/workflows/helm-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v3
@@ -38,7 +38,7 @@ jobs:
3838

3939
publish:
4040
name: Publish charts on GitHub Pages
41-
runs-on: ubuntu-20.04
41+
runs-on: ubuntu-22.04
4242
needs: build
4343
steps:
4444
- uses: actions/checkout@v3

.github/workflows/helm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
lint-test:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- name: Checkout
@@ -21,7 +21,7 @@ jobs:
2121
python-version: "3.10"
2222

2323
- name: Set up chart-testing
24-
uses: helm/chart-testing-action@v2.3.0
24+
uses: helm/chart-testing-action@v2.4.0
2525

2626
- name: Run chart-testing (list-changed)
2727
id: list-changed
@@ -37,7 +37,7 @@ jobs:
3737
uses: helm/kind-action@v1.5.0
3838
if: steps.list-changed.outputs.changed == 'true'
3939
with:
40-
node_image: kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1
40+
node_image: kindest/node:v1.26.3@sha256:94eb63275ad6305210041cdb5aca87c8562cc50fa152dbec3fef8c58479db4ff
4141

4242
- name: Apply cert-manager
4343
run: |

.github/workflows/mdbook.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
build:
99
name: Build book
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
steps:
1212
- uses: actions/checkout@v3
1313
- run: make book
@@ -18,7 +18,7 @@ jobs:
1818
retention-days: 1
1919
publish:
2020
name: Publish book on GitHub Pages
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-22.04
2222
needs: build
2323
steps:
2424
- uses: actions/checkout@v3

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- 'v*'
66
jobs:
77
release:
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-22.04
99
steps:
1010
- name: Checkout
1111
uses: actions/checkout@v3

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
default_stages: [commit]
22
repos:
33
- repo: https://github.com/golangci/golangci-lint
4-
rev: v1.49.0
4+
rev: v1.52.2
55
hooks:
66
- id: golangci-lint
77
- repo: https://github.com/pre-commit/pre-commit-hooks

Makefile.versions

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
CILIUM_VERSION = v1.12.4
2-
CERT_MANAGER_VERSION = 1.9.1
3-
CST_VERSION = 1.11.0
4-
CTRL_TOOLS_VERSION=0.11.2
5-
HELM_VERSION = 3.10.0
6-
KIND_VERSION = 0.17.0
7-
KUBERNETES_VERSION = 1.25.3
8-
KUSTOMIZE_VERSION = 4.5.7
9-
MDBOOK_VERSION = 0.4.21
1+
CILIUM_VERSION = v1.12.8
2+
CERT_MANAGER_VERSION = 1.10.2
3+
CST_VERSION = 1.15.0
4+
CTRL_TOOLS_VERSION=0.11.4
5+
HELM_VERSION = 3.11.3
6+
KIND_VERSION = 0.18.0
7+
KUBERNETES_VERSION = 1.26.3
8+
KUSTOMIZE_VERSION = 5.0.1
9+
MDBOOK_VERSION = 0.4.28

charts/tenet/templates/generated/crds/tenet.cybozu.io_crds.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ template "tenet.fullname"
66
. }}-serving-cert'
7-
controller-gen.kubebuilder.io/version: v0.10.0
7+
controller-gen.kubebuilder.io/version: v0.11.4
88
labels:
99
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
1010
app.kubernetes.io/name: '{{ include "tenet.name" . }}'
@@ -126,7 +126,7 @@ metadata:
126126
annotations:
127127
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ template "tenet.fullname"
128128
. }}-serving-cert'
129-
controller-gen.kubebuilder.io/version: v0.10.0
129+
controller-gen.kubebuilder.io/version: v0.11.4
130130
labels:
131131
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
132132
app.kubernetes.io/name: '{{ include "tenet.name" . }}'

charts/tenet/templates/generated/generated.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ rules:
5555
apiVersion: rbac.authorization.k8s.io/v1
5656
kind: ClusterRole
5757
metadata:
58-
creationTimestamp: null
5958
labels:
6059
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
6160
app.kubernetes.io/name: '{{ include "tenet.name" . }}'

config/crd/bases/tenet.cybozu.io_networkpolicyadmissionrules.yaml

Lines changed: 1 addition & 2 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.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.11.4
87
name: networkpolicyadmissionrules.tenet.cybozu.io
98
spec:
109
group: tenet.cybozu.io

0 commit comments

Comments
 (0)