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-07-11 15:42:53 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

gofmt runned

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/config/v1alpha1/defaults.go
+1 -1
View File
@@ -1,7 +1,7 @@
package v1alpha1 package v1alpha1
import ( import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
) )
func addDefaultingFuncs(scheme *runtime.Scheme) error { func addDefaultingFuncs(scheme *runtime.Scheme) error {
pkg/cmd/options.go
+4 -5
View File
@@ -16,13 +16,13 @@ package cmd
import ( import (
"errors" "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" 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/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" 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" healthcheckcontroller "github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/controller/healthcheck"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"io/ioutil" "io/ioutil"
@@ -44,7 +44,6 @@ func init() {
decoder = serializer.NewCodecFactory(scheme).UniversalDecoder() decoder = serializer.NewCodecFactory(scheme).UniversalDecoder()
} }
// FleetServiceOptions holds options related to the fleet agent service. // FleetServiceOptions holds options related to the fleet agent service.
type FleetServiceOptions struct { type FleetServiceOptions struct {
ConfigLocation string ConfigLocation string
pkg/controller/actuator.go
+4 -4
View File
@@ -54,7 +54,7 @@ func NewActuator(config config.Config) extension.Actuator {
panic(err) panic(err)
} }
fleetClientConfig, _ := clientcmd.BuildConfigFromFlags("", kubeconfigPath) 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 { if err != nil {
panic(err) panic(err)
} }
@@ -87,7 +87,7 @@ func (a *actuator) Reconcile(ctx context.Context, ex *extensionsv1alpha1.Extensi
} }
cfg := &config.Config{} 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 { if _, _, err := a.decoder.Decode(ex.Spec.ProviderConfig.Raw, nil, cfg); err != nil {
return fmt.Errorf("failed to decode provider config: %+v", err) 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["corebundle"] = "true"
labels["region"] = cluster.Shoot.Spec.Region labels["region"] = cluster.Shoot.Spec.Region
labels["cluster"] = cluster.Shoot.Name labels["cluster"] = cluster.Shoot.Name
if a.serviceConfig.FleetAgentConfig.Labels != nil && len(a.serviceConfig.FleetAgentConfig.Labels) > 0 {//adds labels from configuration if a.serviceConfig.FleetAgentConfig.Labels != nil && len(a.serviceConfig.FleetAgentConfig.Labels) > 0 { //adds labels from configuration
for key, value := range a.serviceConfig.Labels{ for key, value := range a.serviceConfig.Labels {
labels[key] = value labels[key] = value
} }
} }
pkg/controller/utils.go
-1
View File
@@ -21,4 +21,3 @@ func writeKubeconfigToTempFile(kubeconfig []byte) (path string, error error) {
} }
return tmpFile.Name(), nil return tmpFile.Name(), nil
} }