github-mirrors/gardener-extension-shoot-fleet-agent
1
0
Fork 0
mirror of https://github.com/ysoftdevs/gardener-extension-shoot-fleet-agent.git synced 2026-03-17 23:04:11 +01:00
Code Issues Packages Projects Releases 1 Wiki Activity

minor changes to make linter happy

Browse Source
This commit is contained in:
Jakub Vavřík
2021-01-28 18:48:40 +01:00
parent ac4d934c86
commit a3dd604264
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/config/doc.go
View File

@@ -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

4
pkg/apis/config/loader/loader.go
View File

@@ -13,7 +13,9 @@ import (
)
var (
Codec runtime.Codec
//codec used to encode
Codec runtime.Codec
//scheme to register
Scheme *runtime.Scheme
)

1
pkg/cmd/options.go
View File

@@ -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

11
pkg/controller/actuator.go
View File

@@ -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{}

1
pkg/controller/config/config.go
View File

@@ -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
}

6
pkg/controller/fleetmanager.go
View File

@@ -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{})
}