From 4e544bded25316b7abcb1b9d40c4ec8e495bda2d Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Fri, 15 Nov 2019 23:48:15 +0000 Subject: [PATCH] Delete unused code --- pkg/tls/storage.go | 104 --------------------------------------------- 1 file changed, 104 deletions(-) delete mode 100644 pkg/tls/storage.go diff --git a/pkg/tls/storage.go b/pkg/tls/storage.go deleted file mode 100644 index f857bb3277..0000000000 --- a/pkg/tls/storage.go +++ /dev/null @@ -1,104 +0,0 @@ -package tls - -import ( - "context" - - "github.com/rancher/dynamiclistener" - v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" - k3sclient "github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io/v1" - "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) - -const ( - ns = "kube-system" - name = "tls-config" -) - -func NewServer(ctx context.Context, listenerConfigs k3sclient.ListenerConfigController, config dynamiclistener.UserConfig) (dynamiclistener.ServerInterface, error) { - storage := &listenerConfigStorage{ - client: listenerConfigs, - cache: listenerConfigs.Cache(), - config: config, - } - - server, err := dynamiclistener.NewServer(storage, config) - if err != nil { - return nil, err - } - - listenerConfigs.OnChange(ctx, "listen-config", func(key string, obj *v1.ListenerConfig) (*v1.ListenerConfig, error) { - if obj == nil { - return nil, nil - } - return obj, server.Update(storage.fromStorage(obj)) - }) - - return server, err -} - -type listenerConfigStorage struct { - cache k3sclient.ListenerConfigCache - client k3sclient.ListenerConfigClient - config dynamiclistener.UserConfig -} - -func (l *listenerConfigStorage) Set(config *dynamiclistener.ListenerStatus) (*dynamiclistener.ListenerStatus, error) { - if config == nil { - return nil, nil - } - - obj, err := l.cache.Get(ns, name) - if errors.IsNotFound(err) { - ls := v1.NewListenerConfig(ns, name, v1.ListenerConfig{ - Status: *config, - }) - - ls, err := l.client.Create(ls) - return l.fromStorage(ls), err - } else if err != nil { - return nil, err - } - - obj = obj.DeepCopy() - obj.ResourceVersion = config.Revision - obj.Status = *config - obj.Status.Revision = "" - - if l.config.CAKey != "" { - obj.Status.CAKey = "" - } - - obj, err = l.client.Update(obj) - return l.fromStorage(obj), err -} - -func (l *listenerConfigStorage) Get() (*dynamiclistener.ListenerStatus, error) { - obj, err := l.cache.Get(ns, name) - if errors.IsNotFound(err) { - obj, err = l.client.Get(ns, name, metav1.GetOptions{}) - } - if errors.IsNotFound(err) { - return &dynamiclistener.ListenerStatus{}, nil - } - return l.fromStorage(obj), err -} - -func (l *listenerConfigStorage) fromStorage(obj *v1.ListenerConfig) *dynamiclistener.ListenerStatus { - if obj == nil { - return nil - } - - copy := obj.DeepCopy() - copy.Status.Revision = obj.ResourceVersion - - if l.config.CACerts != "" && l.config.CAKey != "" { - if copy.Status.CACert != l.config.CACerts { - copy.Status.CACert = l.config.CACerts - copy.Status.GeneratedCerts = map[string]string{} - } - copy.Status.CAKey = l.config.CAKey - } - - return ©.Status -}