kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use NewVFSContext in kops-controller

This commit is contained in:
John Gardiner Myers 2023-07-15 15:48:56 -07:00
parent 0d1c6371d6
commit e04fc1314f
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kops-controller/controllers/legacy_node_controller.go
View File

@ -39,7 +39,7 @@ import (
) )
// NewLegacyNodeReconciler is the constructor for a LegacyNodeReconciler // NewLegacyNodeReconciler is the constructor for a LegacyNodeReconciler
func NewLegacyNodeReconciler(mgr manager.Manager, configPath string, identifier nodeidentity.LegacyIdentifier) (*LegacyNodeReconciler, error) { func NewLegacyNodeReconciler(mgr manager.Manager, vfsContext *vfs.VFSContext, configPath string, identifier nodeidentity.LegacyIdentifier) (*LegacyNodeReconciler, error) {
r := &LegacyNodeReconciler{ r := &LegacyNodeReconciler{
client: mgr.GetClient(), client: mgr.GetClient(),
log: ctrl.Log.WithName("controllers").WithName("Node"), log: ctrl.Log.WithName("controllers").WithName("Node"),
@ -53,7 +53,7 @@ func NewLegacyNodeReconciler(mgr manager.Manager, configPath string, identifier
} }
r.coreV1Client = coreClient r.coreV1Client = coreClient
configBase, err := vfs.Context.BuildVfsPath(configPath) configBase, err := vfsContext.BuildVfsPath(configPath)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot parse ConfigBase %q: %v", configPath, err) return nil, fmt.Errorf("cannot parse ConfigBase %q: %v", configPath, err)
} }

11
cmd/kops-controller/main.go
View File

@ -47,6 +47,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup/hetzner" "k8s.io/kops/upup/pkg/fi/cloudup/hetzner"
"k8s.io/kops/upup/pkg/fi/cloudup/openstack" "k8s.io/kops/upup/pkg/fi/cloudup/openstack"
"k8s.io/kops/upup/pkg/fi/cloudup/scaleway" "k8s.io/kops/upup/pkg/fi/cloudup/scaleway"
"k8s.io/kops/util/pkg/vfs"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager"
@ -114,6 +115,8 @@ func main() {
os.Exit(1) os.Exit(1)
} }
vfsContext := vfs.NewVFSContext()
if opt.Server != nil { if opt.Server != nil {
var verifier bootstrap.Verifier var verifier bootstrap.Verifier
var err error var err error
@ -166,7 +169,7 @@ func main() {
os.Exit(1) os.Exit(1)
} }
srv, err := server.NewServer(&opt, verifier, uncachedClient) srv, err := server.NewServer(vfsContext, &opt, verifier, uncachedClient)
if err != nil { if err != nil {
setupLog.Error(err, "unable to create server") setupLog.Error(err, "unable to create server")
os.Exit(1) os.Exit(1)
@ -182,7 +185,7 @@ func main() {
} }
} }
if err := addNodeController(mgr, &opt); err != nil { if err := addNodeController(mgr, vfsContext, &opt); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "NodeController") setupLog.Error(err, "unable to create controller", "controller", "NodeController")
os.Exit(1) os.Exit(1)
} }
@ -212,7 +215,7 @@ func buildScheme() error {
return nil return nil
} }
func addNodeController(mgr manager.Manager, opt *config.Options) error { func addNodeController(mgr manager.Manager, vfsContext *vfs.VFSContext, opt *config.Options) error {
var legacyIdentifier nodeidentity.LegacyIdentifier var legacyIdentifier nodeidentity.LegacyIdentifier
var identifier nodeidentity.Identifier var identifier nodeidentity.Identifier
var err error var err error
@ -282,7 +285,7 @@ func addNodeController(mgr manager.Manager, opt *config.Options) error {
return fmt.Errorf("must specify secretStore") return fmt.Errorf("must specify secretStore")
} }
nodeController, err := controllers.NewLegacyNodeReconciler(mgr, opt.ConfigBase, legacyIdentifier) nodeController, err := controllers.NewLegacyNodeReconciler(mgr, vfsContext, opt.ConfigBase, legacyIdentifier)
if err != nil { if err != nil {
return err return err
} }

11
cmd/kops-controller/pkg/server/server.go
View File

@ -51,7 +51,7 @@ import (
type Server struct { type Server struct {
opt *config.Options opt *config.Options
certNames sets.String certNames sets.Set[string]
keypairIDs map[string]string keypairIDs map[string]string
server *http.Server server *http.Server
verifier bootstrap.Verifier verifier bootstrap.Verifier
@ -70,30 +70,29 @@ type Server struct {
var _ manager.LeaderElectionRunnable = &Server{} var _ manager.LeaderElectionRunnable = &Server{}
func NewServer(opt *config.Options, verifier bootstrap.Verifier, uncachedClient client.Client) (*Server, error) { func NewServer(vfsContext *vfs.VFSContext, opt *config.Options, verifier bootstrap.Verifier, uncachedClient client.Client) (*Server, error) {
server := &http.Server{ server := &http.Server{
Addr: opt.Server.Listen, Addr: opt.Server.Listen,
TLSConfig: &tls.Config{ TLSConfig: &tls.Config{
MinVersion: tls.VersionTLS12, MinVersion: tls.VersionTLS12,
PreferServerCipherSuites: true,
}, },
} }
s := &Server{ s := &Server{
opt: opt, opt: opt,
certNames: sets.NewString(opt.Server.CertNames...), certNames: sets.New(opt.Server.CertNames...),
server: server, server: server,
verifier: verifier, verifier: verifier,
uncachedClient: uncachedClient, uncachedClient: uncachedClient,
} }
configBase, err := vfs.Context.BuildVfsPath(opt.ConfigBase) configBase, err := vfsContext.BuildVfsPath(opt.ConfigBase)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot parse ConfigBase %q: %w", opt.ConfigBase, err) return nil, fmt.Errorf("cannot parse ConfigBase %q: %w", opt.ConfigBase, err)
} }
s.configBase = configBase s.configBase = configBase
p, err := vfs.Context.BuildVfsPath(opt.SecretStore) p, err := vfsContext.BuildVfsPath(opt.SecretStore)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot parse SecretStore %q: %w", opt.SecretStore, err) return nil, fmt.Errorf("cannot parse SecretStore %q: %w", opt.SecretStore, err)
} }