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

Jump to bottom

update k8s libs to 1.26. #2687

Merged
merged 3 commits into from
Apr 18, 2023
Merged

update k8s libs to 1.26. #2687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d156905
update k8s libs to 1.26.
mhenriks Apr 11, 2023
167a90e
remove some checks in log messages, they're redundant, and the format…
mhenriks Apr 12, 2023
e829864
use 1.26 lib function `CheckVolumeModeMismatches` and `CheckAccessModes`
mhenriks Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
93 changes: 71 additions & 22 deletions api/openapi-spec/swagger.json
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 1 addition & 14 deletions cmd/cdi-controller/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")

go_library(
name = "go_default_library",
srcs = [
"controller.go",
"leaderelection.go",
],
srcs = ["controller.go"],
importpath = "kubevirt.io/containerized-data-importer/cmd/cdi-controller",
visibility = ["//visibility:private"],
deps = [
"//pkg/common:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/controller/datavolume:go_default_library",
"//pkg/controller/transfer:go_default_library",
"//pkg/operator:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/cert:go_default_library",
"//pkg/util/cert/fetcher:go_default_library",
Expand All @@ -27,22 +23,13 @@ go_library(
"//vendor/github.com/pkg/errors:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
"//vendor/go.uber.org/zap/zapcore:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/networking/v1:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
"//vendor/k8s.io/client-go/tools/leaderelection:go_default_library",
"//vendor/k8s.io/client-go/tools/leaderelection/resourcelock:go_default_library",
"//vendor/k8s.io/client-go/tools/record:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/cache:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/client/config:go_default_library",
Expand Down
28 changes: 9 additions & 19 deletions cmd/cdi-controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package main

import (
"context"
"crypto/rsa"
"flag"
"fmt"
Expand All @@ -22,7 +21,6 @@ import (
apiruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/cache"
Expand Down Expand Up @@ -145,11 +143,16 @@ func getRequiredEnvVar(name string) string {
return val
}

func start(ctx context.Context, cfg *rest.Config) {
func start() {
klog.Info("Starting CDI controller components")

namespace := util.GetNamespace()

cfg, err := clientcmd.BuildConfigFromFlags(kubeURL, kubeconfig)
if err != nil {
klog.Fatalf("Unable to get kube config: %v\n", errors.WithStack(err))
}

client, err := kubernetes.NewForConfig(cfg)
if err != nil {
klog.Fatalf("Unable to get kube client: %v\n", errors.WithStack(err))
Expand Down Expand Up @@ -209,6 +212,8 @@ func start(ctx context.Context, cfg *rest.Config) {
os.Exit(1)
}

ctx := signals.SetupSignalHandler()

// TODO: Current DV controller had threadiness 3, should we do the same here, defaults to one thread.
if _, err := dvc.NewImportController(ctx, mgr, log, installerLabels); err != nil {
klog.Errorf("Unable to setup datavolume import controller: %v", err)
Expand Down Expand Up @@ -285,26 +290,11 @@ func main() {
logf.SetLogger(zap.New(zap.Level(zapcore.Level(-1*verbosityLevel)), zap.UseDevMode(debug)))
logf.Log.WithName("main").Info("Verbosity level", "verbose", verbose, "debug", debug)

cfg, err := clientcmd.BuildConfigFromFlags(kubeURL, kubeconfig)
if err != nil {
klog.Fatalf("Unable to get kube config: %v\n", errors.WithStack(err))
}

ctx := signals.SetupSignalHandler()

err = startLeaderElection(context.TODO(), cfg, func() {
start(ctx, cfg)
})

if err != nil {
klog.Fatalf("Unable to start leader election: %v\n", errors.WithStack(err))
}

if err = createReadyFile(); err != nil {
klog.Fatalf("Error creating ready file: %+v", err)
}

<-ctx.Done()
start()

deleteReadyFile()

Expand Down
120 changes: 0 additions & 120 deletions cmd/cdi-controller/leaderelection.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/cdi-operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func main() {
LeaderElection: true,
LeaderElectionNamespace: namespace,
LeaderElectionID: "cdi-operator-leader-election-helper",
LeaderElectionResourceLock: "configmapsleases",
LeaderElectionResourceLock: "leases",
}

// Create a new Manager to provide shared dependencies and start components
Expand Down