From a3dd604264bac77ebb7bedc2ac9acfa5da971188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Vav=C5=99=C3=ADk?= Date: Thu, 28 Jan 2021 18:48:40 +0100 Subject: [PATCH] minor changes to make linter happy --- pkg/apis/config/doc.go | 1 + pkg/apis/config/loader/loader.go | 4 +++- pkg/cmd/options.go | 1 + pkg/controller/actuator.go | 11 +++++++---- pkg/controller/config/config.go | 1 + pkg/controller/fleetmanager.go | 6 ++++++ 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkg/apis/config/doc.go b/pkg/apis/config/doc.go index 83c4cc7..ab67b85 100644 --- a/pkg/apis/config/doc.go +++ b/pkg/apis/config/doc.go @@ -2,4 +2,5 @@ // +groupName="shoot-fleet-agent-service.extensions.config.gardener.cloud" //go:generate ../../../hack/update-codegen.sh +//Package config that holds config api package config diff --git a/pkg/apis/config/loader/loader.go b/pkg/apis/config/loader/loader.go index 18ef1d9..4e7c6d5 100644 --- a/pkg/apis/config/loader/loader.go +++ b/pkg/apis/config/loader/loader.go @@ -13,7 +13,9 @@ import ( ) var ( - Codec runtime.Codec + //codec used to encode + Codec runtime.Codec + //scheme to register Scheme *runtime.Scheme ) diff --git a/pkg/cmd/options.go b/pkg/cmd/options.go index 21ab480..d43c399 100644 --- a/pkg/cmd/options.go +++ b/pkg/cmd/options.go @@ -102,6 +102,7 @@ func ControllerSwitches() *cmd.SwitchOptions { ) } +// ApplyHealthCheckConfig applies healthcheck config func (c *FleetServiceConfig) ApplyHealthCheckConfig(config *healthcheckconfig.HealthCheckConfig) { if c.config.HealthCheckConfig != nil { *config = *c.config.HealthCheckConfig diff --git a/pkg/controller/actuator.go b/pkg/controller/actuator.go index fbc56a6..0a5d962 100644 --- a/pkg/controller/actuator.go +++ b/pkg/controller/actuator.go @@ -42,7 +42,11 @@ import ( // ActuatorName is the name of the Fleet agent actuator. const ActuatorName = "shoot-fleet-agent-actuator" + +// KubeconfigSecretName name of secret that holds kubeconfig for Shoot const KubeconfigSecretName = "kubecfg" + +// KubeconfigKey key in KubeconfigSecretName secret that holds kubeconfig for Shoot const KubeconfigKey = "kubeconfig" // NewActuator returns an actuator responsible for Extension resources. @@ -93,7 +97,7 @@ func (a *actuator) Reconcile(ctx context.Context, ex *extensionsv1alpha1.Extensi } } - a.registerClusterInFleetManager(ctx, namespace, cluster) + a.RegisterClusterInFleetManager(ctx, namespace, cluster) return a.updateStatus(ctx, ex) } @@ -135,14 +139,13 @@ func (a *actuator) InjectScheme(scheme *runtime.Scheme) error { return nil } -func (a *actuator) registerClusterInFleetManager(ctx context.Context, namespace string, cluster *extensions.Cluster) { +// RegisterClusterInFleetManager registers cluster in remote fleet manager +func (a *actuator) RegisterClusterInFleetManager(ctx context.Context, namespace string, cluster *extensions.Cluster) { a.logger.Info("Starting with already registered check") registered, err := a.fleetManager.GetCluster(ctx, cluster.Shoot.Name) if !errors.IsNotFound(err) { a.logger.Info("Cluster already registered - skipping registration", "clientId", registered.Spec.ClientID) return - } else { - a.logger.Info("Cluster registration not found.") } a.logger.Info("Starting cluster registration process") secret := &corev1.Secret{} diff --git a/pkg/controller/config/config.go b/pkg/controller/config/config.go index 319f675..877b780 100644 --- a/pkg/controller/config/config.go +++ b/pkg/controller/config/config.go @@ -2,6 +2,7 @@ package config import "github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/apis/config" +//Holds controller config type Config struct { config.FleetAgentConfig } diff --git a/pkg/controller/fleetmanager.go b/pkg/controller/fleetmanager.go index 38b3278..3fa3194 100644 --- a/pkg/controller/fleetmanager.go +++ b/pkg/controller/fleetmanager.go @@ -10,12 +10,14 @@ import ( "k8s.io/client-go/rest" ) +//FleetManager serves as main communication point with external Fleet Manager type FleetManager struct { secretClient kubernetes.Clientset fleetClient clientset.Interface namespace string } +//Constructs new manager with given config operating in given namespace func NewManagerForConfig(c *rest.Config, namespace string) (*FleetManager, error) { secretClient, err := kubernetes.NewForConfig(c) if err != nil { @@ -34,18 +36,22 @@ func NewManagerForConfig(c *rest.Config, namespace string) (*FleetManager, error }, nil } +//registers a cluster in remote fleet func (f *FleetManager) CreateCluster(ctx context.Context, cluster *v1alpha1.Cluster) (*v1alpha1.Cluster, error) { return f.fleetClient.FleetV1alpha1().Clusters(f.namespace).Create(ctx, cluster, metav1.CreateOptions{}) } +//updates a cluster registration in remote fleet func (f *FleetManager) UpdateCluster(ctx context.Context, cluster *v1alpha1.Cluster) (*v1alpha1.Cluster, error) { return f.fleetClient.FleetV1alpha1().Clusters(f.namespace).Update(ctx, cluster, metav1.UpdateOptions{}) } +//gets a cluster registration from remote fleet func (f *FleetManager) GetCluster(ctx context.Context, clusterName string) (*v1alpha1.Cluster, error) { return f.fleetClient.FleetV1alpha1().Clusters(f.namespace).Get(ctx, clusterName, metav1.GetOptions{}) } +//registers a clusters kubeconfig secret in remote fleet func (f *FleetManager) CreateKubeconfigSecret(ctx context.Context, secret *corev1.Secret) (*corev1.Secret, error) { return f.secretClient.CoreV1().Secrets(f.namespace).Create(ctx, secret, metav1.CreateOptions{}) }