Skip to content

Migrate from duplicate certwatcher to vendored controller-runtime ver… #3884

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

Open
r-ohan019 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate from duplicate certwatcher to vendored controller-runtime ver… #3884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/cdi-apiserver/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ go_library(
"//pkg/client/clientset/versioned:go_default_library",
"//pkg/common:go_default_library",
"//pkg/controller/datavolume:go_default_library",
"//pkg/util/cert/watcher:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher:go_default_library",
"//pkg/util/tls-crypto-watch:go_default_library",
"//pkg/version/verflag:go_default_library",
"//staging/src/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1:go_default_library",
Expand Down
4 changes: 2 additions & 2 deletions cmd/cdi-apiserver/apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ import (

"sigs.k8s.io/controller-runtime/pkg/cluster"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
"sigs.k8s.io/controller-runtime/pkg/certwatcher"

cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
"kubevirt.io/containerized-data-importer/pkg/apiserver"
cdiclient "kubevirt.io/containerized-data-importer/pkg/client/clientset/versioned"
"kubevirt.io/containerized-data-importer/pkg/common"
dvc "kubevirt.io/containerized-data-importer/pkg/controller/datavolume"
certwatcher "kubevirt.io/containerized-data-importer/pkg/util/cert/watcher"
cryptowatch "kubevirt.io/containerized-data-importer/pkg/util/tls-crypto-watch"
"kubevirt.io/containerized-data-importer/pkg/version/verflag"
)
Expand Down Expand Up @@ -189,7 +189,7 @@ func main() {
}()

go func() {
if err := certWatcher.Start(ctx.Done()); err != nil {
if err := certWatcher.Start(ctx); err != nil {
klog.Errorf("cert watcher failed: %v\n", errors.WithStack(err))
}
}()
Expand Down
2 changes: 1 addition & 1 deletion cmd/cdi-uploadproxy/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ go_library(
"//pkg/uploadproxy:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/cert/fetcher:go_default_library",
"//pkg/util/cert/watcher:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher:go_default_library",
"//pkg/util/tls-crypto-watch:go_default_library",
"//vendor/github.com/kelseyhightower/envconfig:go_default_library",
"//vendor/github.com/pkg/errors:go_default_library",
Expand Down
4 changes: 2 additions & 2 deletions cmd/cdi-uploadproxy/uploadproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"k8s.io/klog/v2"

"sigs.k8s.io/controller-runtime/pkg/manager/signals"
"sigs.k8s.io/controller-runtime/pkg/certwatcher"

cdiclient "kubevirt.io/containerized-data-importer/pkg/client/clientset/versioned"
"kubevirt.io/containerized-data-importer/pkg/uploadproxy"
"kubevirt.io/containerized-data-importer/pkg/util"
certfetcher "kubevirt.io/containerized-data-importer/pkg/util/cert/fetcher"
certwatcher "kubevirt.io/containerized-data-importer/pkg/util/cert/watcher"
cryptowatch "kubevirt.io/containerized-data-importer/pkg/util/tls-crypto-watch"
)

Expand Down Expand Up @@ -123,7 +123,7 @@ func main() {
}

go func() {
if err := certWatcher.Start(ctx.Done()); err != nil {
if err := certWatcher.Start(ctx); err != nil {
klog.Errorf("failed to close certWatcher, %v", err)
}
if err := ctx.Err(); err != nil {
Expand Down
12 changes: 0 additions & 12 deletions pkg/util/cert/watcher/BUILD.bazel
View file
Open in desktop

This file was deleted.

161 changes: 0 additions & 161 deletions pkg/util/cert/watcher/certwatcher.go
View file
Open in desktop

This file was deleted.