Skip to content

Commit

Permalink
Merge pull request #672 from cybozu-go/k8s-1.27
Browse files Browse the repository at this point in the history
Support Kubernetes 1.27
  • Loading branch information
masa213f authored Nov 30, 2023
2 parents 20eadbd + e813a26 commit cdf3a1f
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
go-version-file: go.mod
- name: Check auto-generated files
run: make check-generate
- run: docker run -d --network host gcr.io/etcd-development/etcd:v3.5.9
- run: docker run -d --network host gcr.io/etcd-development/etcd:v3.5.10
- run: make test
- run: make install GOBIN=$(pwd)/docker
- run: docker build -t quay.io/cybozu/cke:latest ./docker
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Makefile for cke

ETCD_VERSION = 3.5.9
ETCD_VERSION = 3.5.10

.PHONY: all
all: test
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
command: /opt/setup/setup.sh
vault:
container_name: vault
image: quay.io/cybozu/vault:1.13
image: quay.io/cybozu/vault:1.14
networks:
app_net:
ipv4_address: 172.30.0.13
Expand Down
12 changes: 6 additions & 6 deletions images.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ func (i Image) Name() string {

// Container image definitions
const (
EtcdImage = Image("quay.io/cybozu/etcd:3.5.9.1")
KubernetesImage = Image("quay.io/cybozu/kubernetes:1.26.6.1")
ToolsImage = Image("quay.io/cybozu/cke-tools:1.26.0")
PauseImage = Image("quay.io/cybozu/pause:3.9.0.1")
CoreDNSImage = Image("quay.io/cybozu/coredns:1.10.1.1")
EtcdImage = Image("quay.io/cybozu/etcd:3.5.10.1")
KubernetesImage = Image("quay.io/cybozu/kubernetes:1.27.8.1")
ToolsImage = Image("quay.io/cybozu/cke-tools:1.27.0")
PauseImage = Image("quay.io/cybozu/pause:3.9.0.2")
CoreDNSImage = Image("quay.io/cybozu/coredns:1.11.1.1")
UnboundImage = Image("ghcr.io/cybozu/unbound:1.18.0.2")
UnboundExporterImage = Image("quay.io/cybozu/unbound_exporter:0.4.1.5")
UnboundExporterImage = Image("quay.io/cybozu/unbound_exporter:0.4.4.1")
)

// AllImages return container images list used by CKE
Expand Down
10 changes: 5 additions & 5 deletions mtest/Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Makefile for multi-host testing using ginkgo

# tool versions
MANAGEMENT_ETCD_VERSION = 3.5.9
VAULT_VERSION = 1.14.0
K8S_VERSION = 1.26.6
CONTAINERD_VERSION = 1.7.2
CRITOOLS_VERSION = 1.27.1
MANAGEMENT_ETCD_VERSION = 3.5.10
VAULT_VERSION = 1.15.2
K8S_VERSION = 1.27.8
CONTAINERD_VERSION = 1.7.9
CRITOOLS_VERSION = 1.28.0
CT_VERSION = 0.9.3

# configuration variables
Expand Down
1 change: 0 additions & 1 deletion op/k8s/kubelet_boot.go
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ func KubeletServiceParams(n *cke.Node, params cke.KubeletParams) cke.ServicePara
"--kubeconfig=/etc/kubernetes/kubelet/kubeconfig",
"--hostname-override=" + n.Nodename(),
}
args = append(args, "--container-runtime=remote")
if len(params.CRIEndpoint) != 0 {
args = append(args, "--container-runtime-endpoint="+params.CRIEndpoint)
}
Expand Down
6 changes: 3 additions & 3 deletions sonobuoy/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### Configurable variables
SONOBUOY_VERSION = 0.56.17
KUBECTL_VERSION = 1.26.6
DOCKER_COMPOSE_VERSION = 2.20.0
SONOBUOY_VERSION = 0.57.1
KUBECTL_VERSION = 1.27.8
DOCKER_COMPOSE_VERSION = 2.23.3
CT_VERSION = 0.9.3

### Unconfigurable
Expand Down
2 changes: 1 addition & 1 deletion sonobuoy/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
command: /opt/setup/setup.sh
vault:
container_name: vault
image: quay.io/cybozu/vault:1.13
image: quay.io/cybozu/vault:1.14
networks:
app_net:
ipv4_address: 172.30.0.13
Expand Down
1 change: 0 additions & 1 deletion static/cluster-dns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ rules:
- apiGroups:
- ""
resources:
- endpoints
- services
- pods
- namespaces
Expand Down
10 changes: 5 additions & 5 deletions static/resources.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cdf3a1f

Please sign in to comment.