Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Kubernetes 1.28 #285

Merged
merged 7 commits into from
May 1, 2024
Merged

Support Kubernetes 1.28 #285

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3380441
Support Kubernetes 1.28
terassyi Apr 26, 2024
b244df6
Fix some errors due to support kubernetes 1.28
terassyi Apr 30, 2024
9f1cbbb
Stop updating cni library
terassyi Apr 30, 2024
a976955
Fix controller-gen version
terassyi Apr 30, 2024
c39b913
WIP: check the difference
terassyi May 1, 2024
6406be5
Fix controller-gen version
terassyi May 1, 2024
5f17168
Reflect review
terassyi May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ jobs:
name: End-to-end Test
strategy:
matrix:
kindest-node: ["1.25.9", "1.26.4", "1.27.1"]
kindest-node: ["1.26.14", "1.27.11", "1.28.7"]
ip-version: ["ipv4", "ipv6"]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ env.go-version }}
- run: make image
Expand All @@ -67,7 +67,7 @@ jobs:
- run: make logs
working-directory: v2/e2e
if: always()
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: logs-${{ matrix.ip-version }}-${{ matrix.kindest-node }}.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ env.go-version }}
- name: Set up QEMU
Expand All @@ -26,7 +26,7 @@ jobs:
uses: docker/setup-buildx-action@v3
- name: Cache tools
id: cache-tools
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
v2/bin
Expand Down
4 changes: 2 additions & 2 deletions v2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

IMAGE_TAG := latest
CONTROLLER_RUNTIME_VERSION := $(shell awk '/sigs\.k8s\.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
CONTROLLER_TOOLS_VERSION=0.14.0
CONTROLLER_TOOLS_VERSION=0.15.0
PROTOC_VERSION=26.0
PROTOC_GEN_GO_VERSION := $(shell awk '/google.golang.org\/protobuf/ {print substr($$2, 2)}' go.mod)
PROTOC_GEN_GO_GRPC_VERSON=1.3.0
Expand Down Expand Up @@ -70,7 +70,7 @@ check-generate:
$(MAKE) generate
$(MAKE) manifests
go mod tidy
git diff --exit-code --name-only
git diff --exit-code

# Generate manifests e.g. CRD, RBAC etc.
.PHONY: manifests
Expand Down
16 changes: 10 additions & 6 deletions v2/api/v2/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/envtest"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
"sigs.k8s.io/controller-runtime/pkg/webhook"
)

// These tests use Ginkgo (BDD-style Go testing framework). Refer to
Expand Down Expand Up @@ -75,12 +77,14 @@ var _ = BeforeSuite(func() {
// start webhook server using Manager
webhookInstallOptions := &testEnv.WebhookInstallOptions
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
Scheme: scheme,
Host: webhookInstallOptions.LocalServingHost,
Port: webhookInstallOptions.LocalServingPort,
CertDir: webhookInstallOptions.LocalServingCertDir,
LeaderElection: false,
MetricsBindAddress: "0",
Scheme: scheme,
WebhookServer: webhook.NewServer(webhook.Options{
Host: webhookInstallOptions.LocalServingHost,
Port: webhookInstallOptions.LocalServingPort,
CertDir: webhookInstallOptions.LocalServingCertDir,
}),
LeaderElection: false,
Metrics: server.Options{BindAddress: "0"},
})
Expect(err).NotTo(HaveOccurred())

Expand Down
17 changes: 12 additions & 5 deletions v2/cmd/coil-controller/sub/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package sub

import (
"fmt"
v2 "github.com/cybozu-go/coil/v2"
"net"
"os"
"strconv"
"time"

v2 "github.com/cybozu-go/coil/v2"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't mind how the packages are organized into blocks, but at least all the packages from Coil should appear in a same block.

v2 "github.com/cybozu-go/coil/v2"
coilv2 "github.com/cybozu-go/coil/v2/api/v2"
"github.com/cybozu-go/coil/v2/pkg/constants"
"github.com/cybozu-go/coil/v2/pkg/indexing"
"github.com/cybozu-go/coil/v2/pkg/ipam"
"github.com/cybozu-go/coil/v2/runners"


coilv2 "github.com/cybozu-go/coil/v2/api/v2"
"github.com/cybozu-go/coil/v2/controllers"
"github.com/cybozu-go/coil/v2/pkg/constants"
Expand All @@ -21,6 +22,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"sigs.k8s.io/controller-runtime/pkg/webhook"
)

const (
Expand Down Expand Up @@ -57,12 +60,16 @@ func subMain() error {
LeaderElection: true,
LeaderElectionID: "coil-leader",
LeaderElectionNamespace: "kube-system", // coil should run in kube-system
MetricsBindAddress: config.metricsAddr,
Metrics: metricsserver.Options{
BindAddress: config.metricsAddr,
},
GracefulShutdownTimeout: &timeout,
HealthProbeBindAddress: config.healthAddr,
Host: host,
Port: port,
CertDir: config.certDir,
WebhookServer: webhook.NewServer(webhook.Options{
Host: host,
Port: port,
CertDir: config.certDir,
}),
})
if err != nil {
return err
Expand Down
12 changes: 8 additions & 4 deletions v2/cmd/coil-egress/sub/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package sub
import (
"errors"
"fmt"
v2 "github.com/cybozu-go/coil/v2"
"net"
"os"
"strings"
"time"

v2 "github.com/cybozu-go/coil/v2"

"github.com/cybozu-go/coil/v2/controllers"
"github.com/cybozu-go/coil/v2/pkg/constants"
"github.com/cybozu-go/coil/v2/pkg/founat"
Expand All @@ -18,6 +19,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
)

const (
Expand Down Expand Up @@ -69,9 +71,11 @@ func subMain() error {

timeout := gracefulTimeout
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
LeaderElection: false,
MetricsBindAddress: config.metricsAddr,
Scheme: scheme,
LeaderElection: false,
Metrics: metricsserver.Options{
BindAddress: config.metricsAddr,
},
GracefulShutdownTimeout: &timeout,
HealthProbeBindAddress: config.healthAddr,
})
Expand Down
12 changes: 8 additions & 4 deletions v2/cmd/coil-router/sub/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package sub
import (
"errors"
"fmt"
v2 "github.com/cybozu-go/coil/v2"
"os"
"time"

v2 "github.com/cybozu-go/coil/v2"

coilv2 "github.com/cybozu-go/coil/v2/api/v2"
"github.com/cybozu-go/coil/v2/controllers"
"github.com/cybozu-go/coil/v2/pkg/constants"
Expand All @@ -18,6 +19,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
)

const (
Expand Down Expand Up @@ -46,9 +48,11 @@ func subMain() error {

timeout := gracefulTimeout
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
LeaderElection: false,
MetricsBindAddress: config.metricsAddr,
Scheme: scheme,
LeaderElection: false,
Metrics: metricsserver.Options{
BindAddress: config.metricsAddr,
},
GracefulShutdownTimeout: &timeout,
HealthProbeBindAddress: config.healthAddr,
})
Expand Down
12 changes: 8 additions & 4 deletions v2/cmd/coild/sub/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import (
"context"
"errors"
"fmt"
v2 "github.com/cybozu-go/coil/v2"
"net"
"os"
"time"

v2 "github.com/cybozu-go/coil/v2"

coilv2 "github.com/cybozu-go/coil/v2/api/v2"
"github.com/cybozu-go/coil/v2/controllers"
"github.com/cybozu-go/coil/v2/pkg/constants"
Expand All @@ -23,6 +24,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
)

const (
Expand Down Expand Up @@ -56,9 +58,11 @@ func subMain() error {

timeout := gracefulTimeout
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
LeaderElection: false,
MetricsBindAddress: config.metricsAddr,
Scheme: scheme,
LeaderElection: false,
Metrics: metricsserver.Options{
BindAddress: config.metricsAddr,
},
GracefulShutdownTimeout: &timeout,
HealthProbeBindAddress: config.healthAddr,
})
Expand Down
2 changes: 1 addition & 1 deletion v2/config/crd/bases/coil.cybozu.com_addressblocks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.15.0
name: addressblocks.coil.cybozu.com
spec:
group: coil.cybozu.com
Expand Down
2 changes: 1 addition & 1 deletion v2/config/crd/bases/coil.cybozu.com_addresspools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.15.0
name: addresspools.coil.cybozu.com
spec:
group: coil.cybozu.com
Expand Down
2 changes: 1 addition & 1 deletion v2/config/crd/bases/coil.cybozu.com_blockrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.15.0
name: blockrequests.coil.cybozu.com
spec:
group: coil.cybozu.com
Expand Down
Loading
Loading