gofmt runned

This commit is contained in:
Jakub Vavřík
2021-01-28 18:26:43 +01:00
parent 879cd4b33d
commit ac4d934c86
7 changed files with 21 additions and 23 deletions

View File

@@ -1,7 +1,7 @@
package v1alpha1
import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
)
func addDefaultingFuncs(scheme *runtime.Scheme) error {

View File

@@ -37,4 +37,4 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&FleetAgentConfig{},
)
return nil
}
}

View File

@@ -16,13 +16,13 @@ package cmd
import (
"errors"
"github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/controller"
"github.com/gardener/gardener/extensions/pkg/controller/cmd"
extensionshealthcheckcontroller "github.com/gardener/gardener/extensions/pkg/controller/healthcheck"
healthcheckconfig "github.com/gardener/gardener/extensions/pkg/controller/healthcheck/config"
apisconfig "github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/apis/config"
"github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/apis/config/v1alpha1"
"github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/controller"
controllerconfig "github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/controller/config"
"github.com/gardener/gardener/extensions/pkg/controller/cmd"
healthcheckconfig "github.com/gardener/gardener/extensions/pkg/controller/healthcheck/config"
extensionshealthcheckcontroller "github.com/gardener/gardener/extensions/pkg/controller/healthcheck"
healthcheckcontroller "github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/controller/healthcheck"
"github.com/spf13/pflag"
"io/ioutil"
@@ -44,7 +44,6 @@ func init() {
decoder = serializer.NewCodecFactory(scheme).UniversalDecoder()
}
// FleetServiceOptions holds options related to the fleet agent service.
type FleetServiceOptions struct {
ConfigLocation string
@@ -107,4 +106,4 @@ func (c *FleetServiceConfig) ApplyHealthCheckConfig(config *healthcheckconfig.He
if c.config.HealthCheckConfig != nil {
*config = *c.config.HealthCheckConfig
}
}
}

View File

@@ -54,7 +54,7 @@ func NewActuator(config config.Config) extension.Actuator {
panic(err)
}
fleetClientConfig, _ := clientcmd.BuildConfigFromFlags("", kubeconfigPath)
fleetManager, err := NewManagerForConfig(fleetClientConfig, "clusters")//TODO get from config
fleetManager, err := NewManagerForConfig(fleetClientConfig, "clusters") //TODO get from config
if err != nil {
panic(err)
}
@@ -62,14 +62,14 @@ func NewActuator(config config.Config) extension.Actuator {
return &actuator{
logger: log.Log.WithName(ActuatorName),
serviceConfig: config,
fleetManager: fleetManager,
fleetManager: fleetManager,
}
}
type actuator struct {
client client.Client
config *rest.Config
decoder runtime.Decoder
client client.Client
config *rest.Config
decoder runtime.Decoder
fleetManager *FleetManager
serviceConfig config.Config
@@ -87,7 +87,7 @@ func (a *actuator) Reconcile(ctx context.Context, ex *extensionsv1alpha1.Extensi
}
cfg := &config.Config{}
if ex.Spec.ProviderConfig != nil {//here we parse providerconfig
if ex.Spec.ProviderConfig != nil { //here we parse providerconfig
if _, _, err := a.decoder.Decode(ex.Spec.ProviderConfig.Raw, nil, cfg); err != nil {
return fmt.Errorf("failed to decode provider config: %+v", err)
}
@@ -151,8 +151,8 @@ func (a *actuator) registerClusterInFleetManager(ctx context.Context, namespace
labels["corebundle"] = "true"
labels["region"] = cluster.Shoot.Spec.Region
labels["cluster"] = cluster.Shoot.Name
if a.serviceConfig.FleetAgentConfig.Labels != nil && len(a.serviceConfig.FleetAgentConfig.Labels) > 0 {//adds labels from configuration
for key, value := range a.serviceConfig.Labels{
if a.serviceConfig.FleetAgentConfig.Labels != nil && len(a.serviceConfig.FleetAgentConfig.Labels) > 0 { //adds labels from configuration
for key, value := range a.serviceConfig.Labels {
labels[key] = value
}
}
@@ -201,4 +201,4 @@ func (a *actuator) updateStatus(ctx context.Context, ex *extensionsv1alpha1.Exte
return controller.TryUpdateStatus(ctx, retry.DefaultBackoff, a.client, ex, func() error {
return nil
})
}
}

View File

@@ -4,4 +4,4 @@ import "github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/apis/confi
type Config struct {
config.FleetAgentConfig
}
}

View File

@@ -12,8 +12,8 @@ import (
type FleetManager struct {
secretClient kubernetes.Clientset
fleetClient clientset.Interface
namespace string
fleetClient clientset.Interface
namespace string
}
func NewManagerForConfig(c *rest.Config, namespace string) (*FleetManager, error) {
@@ -30,7 +30,7 @@ func NewManagerForConfig(c *rest.Config, namespace string) (*FleetManager, error
return &FleetManager{
secretClient: *secretClient,
fleetClient: fleetClient,
namespace: namespace,
namespace: namespace,
}, nil
}
@@ -48,4 +48,4 @@ func (f *FleetManager) GetCluster(ctx context.Context, clusterName string) (*v1a
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{})
}
}

View File

@@ -21,4 +21,3 @@ func writeKubeconfigToTempFile(kubeconfig []byte) (path string, error error) {
}
return tmpFile.Name(), nil
}