Skip to content

Commit

Permalink
Apply gofmt to federation directory
Browse files Browse the repository at this point in the history
  • Loading branch information
@justinsb
justinsb committed Nov 14, 2016
1 parent baa1a95 commit 9ae1cd3
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 97 deletions.
2 changes: 2 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ gofmt:
gofmt -w -s cloudmock/
gofmt -w -s cmd/
gofmt -w -s examples/
gofmt -w -s federation/
gofmt -w -s util/
gofmt -w -s upup/pkg/
gofmt -w -s protokube/cmd
Expand All @@ -211,6 +212,7 @@ govet:
k8s.io/kops/cmd/... \
k8s.io/kops/channels/... \
k8s.io/kops/examples/... \
k8s.io/kops/federation/... \
k8s.io/kops/util/... \
k8s.io/kops/upup/... \
k8s.io/kops/protokube/... \
Expand Down
83 changes: 41 additions & 42 deletions federation/apply_federation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,35 @@ limitations under the License.
package federation

import (
"fmt"
"k8s.io/kops/upup/pkg/fi/fitasks"
"k8s.io/kops/upup/pkg/fi"
"crypto/rsa"
crypto_rand "crypto/rand"
k8sapiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kops/federation/tasks"
"text/template"
"bytes"
crypto_rand "crypto/rand"
"crypto/rsa"
"fmt"
"github.com/golang/glog"
"k8s.io/kops/federation/model"
"k8s.io/kops/federation/targets/kubernetes"
"k8s.io/kops/federation/tasks"
kopsapi "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/client/simple"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kops/upup/pkg/kutil"
"k8s.io/kops/pkg/client/simple"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/fitasks"
"k8s.io/kops/upup/pkg/fi/k8sapi"
"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
"k8s.io/kops/upup/pkg/kutil"
"k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api/errors"
k8sapiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
"strings"
"text/template"
)

type ApplyFederationOperation struct {
Federation *kopsapi.Federation
KopsClient simple.Clientset
Federation *kopsapi.Federation
KopsClient simple.Clientset

namespace string
name string
namespace string
name string

apiserverDeploymentName string
apiserverServiceName string
Expand All @@ -54,15 +54,14 @@ type ApplyFederationOperation struct {
apiserverSecretName string
}

func (o*ApplyFederationOperation) FindKubecfg() (*kutil.KubeconfigBuilder, error) {
func (o *ApplyFederationOperation) FindKubecfg() (*kutil.KubeconfigBuilder, error) {
// TODO: Only if not yet set?
// hasKubecfg, err := hasKubecfg(f.Name)
// if err != nil {
// glog.Warningf("error reading kubecfg: %v", err)
// hasKubecfg = true
// }


// Loop through looking for a configured cluster
for _, controller := range o.Federation.Spec.Controllers {
cluster, err := o.KopsClient.Clusters().Get(controller)
Expand All @@ -78,11 +77,11 @@ func (o*ApplyFederationOperation) FindKubecfg() (*kutil.KubeconfigBuilder, erro
apiserverKeypair := o.buildApiserverKeypair()

federationConfiguration := &FederationConfiguration{
Namespace: o.namespace,
ApiserverSecretName: o.apiserverSecretName,
Namespace: o.namespace,
ApiserverSecretName: o.apiserverSecretName,
ApiserverServiceName: o.apiserverServiceName,
ApiserverKeypair: apiserverKeypair,
KubeconfigSecretName:"federation-apiserver-kubeconfig",
ApiserverKeypair: apiserverKeypair,
KubeconfigSecretName: "federation-apiserver-kubeconfig",
}
k, err := federationConfiguration.extractKubecfg(context, o.Federation)
if err != nil {
Expand All @@ -98,7 +97,7 @@ func (o*ApplyFederationOperation) FindKubecfg() (*kutil.KubeconfigBuilder, erro
return nil, nil
}

func (o*ApplyFederationOperation) Run() error {
func (o *ApplyFederationOperation) Run() error {
o.namespace = "federation"
o.name = "federation"

Expand Down Expand Up @@ -160,13 +159,13 @@ func (o*ApplyFederationOperation) Run() error {
clusterName := strings.Replace(cluster.Name, ".", "-", -1)

a := &FederationCluster{
FederationNamespace : o.namespace,
FederationNamespace: o.namespace,

ControllerKubernetesClients: controllerKubernetesClients,
FederationClient: federationControllerClient,
FederationClient: federationControllerClient,

ClusterSecretName: "secret-" + cluster.Name,
ClusterName: clusterName,
ClusterName: clusterName,
ApiserverHostname: cluster.Spec.MasterPublicName,
}
err = a.Run(cluster)
Expand All @@ -186,7 +185,7 @@ func (o*ApplyFederationOperation) Run() error {

// Builds a fi.Context applying to the federation namespace in the specified cluster
// Note that this operates inside the cluster, for example the KeyStore is backed by secrets in the namespace
func (o*ApplyFederationOperation) federationContextForCluster(cluster *kopsapi.Cluster) (*fi.Context, error) {
func (o *ApplyFederationOperation) federationContextForCluster(cluster *kopsapi.Cluster) (*fi.Context, error) {
clusterKeystore, err := registry.KeyStore(cluster)
if err != nil {
return nil, err
Expand All @@ -207,12 +206,12 @@ func (o*ApplyFederationOperation) federationContextForCluster(cluster *kopsapi.C
return context, nil
}

func (o*ApplyFederationOperation) buildApiserverKeypair() (*fitasks.Keypair) {
func (o *ApplyFederationOperation) buildApiserverKeypair() *fitasks.Keypair {
keypairName := "secret-" + o.apiserverHostName
keypair := &fitasks.Keypair{
Name: fi.String(keypairName),
Subject: "cn=" + o.Federation.Name,
Type: "server",
Name: fi.String(keypairName),
Subject: "cn=" + o.Federation.Name,
Type: "server",
}

// So it has a valid cert inside the cluster
Expand All @@ -228,7 +227,7 @@ func (o*ApplyFederationOperation) buildApiserverKeypair() (*fitasks.Keypair) {
return keypair
}

func (o*ApplyFederationOperation) runOnCluster(context *fi.Context, cluster *kopsapi.Cluster) error {
func (o *ApplyFederationOperation) runOnCluster(context *fi.Context, cluster *kopsapi.Cluster) error {
_, _, err := EnsureCASecret(context.Keystore)
if err != nil {
return err
Expand All @@ -248,10 +247,10 @@ func (o*ApplyFederationOperation) runOnCluster(context *fi.Context, cluster *kop

federationConfiguration := &FederationConfiguration{
ApiserverServiceName: o.apiserverServiceName,
Namespace: o.namespace,
ApiserverSecretName: o.apiserverSecretName,
ApiserverKeypair: apiserverKeypair,
KubeconfigSecretName:"federation-apiserver-kubeconfig",
Namespace: o.namespace,
ApiserverSecretName: o.apiserverSecretName,
ApiserverKeypair: apiserverKeypair,
KubeconfigSecretName: "federation-apiserver-kubeconfig",
}
err = federationConfiguration.EnsureConfiguration(context)
if err != nil {
Expand All @@ -268,7 +267,7 @@ func (o*ApplyFederationOperation) runOnCluster(context *fi.Context, cluster *kop
}

applyManifestTask := tasks.KubernetesResource{
Name: fi.String(o.name),
Name: fi.String(o.name),
Manifest: fi.WrapResource(fi.NewStringResource(manifest)),
}
err = applyManifestTask.Run(context)
Expand All @@ -279,7 +278,7 @@ func (o*ApplyFederationOperation) runOnCluster(context *fi.Context, cluster *kop
return nil
}

func (o*ApplyFederationOperation) buildTemplateData() map[string]string {
func (o *ApplyFederationOperation) buildTemplateData() map[string]string {
namespace := o.namespace
name := o.name

Expand Down Expand Up @@ -325,7 +324,7 @@ func (o*ApplyFederationOperation) buildTemplateData() map[string]string {
return data
}

func (o*ApplyFederationOperation) executeTemplate(key string, templateDefinition string) (string, error) {
func (o *ApplyFederationOperation) executeTemplate(key string, templateDefinition string) (string, error) {
data := o.buildTemplateData()

t := template.New(key)
Expand Down Expand Up @@ -358,7 +357,7 @@ func (o*ApplyFederationOperation) executeTemplate(key string, templateDefinition
return buffer.String(), nil
}

func (o*ApplyFederationOperation) EnsureNamespace(c *fi.Context) error {
func (o *ApplyFederationOperation) EnsureNamespace(c *fi.Context) error {
k8s := c.Target.(*kubernetes.KubernetesTarget).KubernetesClient

ns, err := k8s.Core().Namespaces().Get(o.namespace)
Expand All @@ -381,7 +380,7 @@ func (o*ApplyFederationOperation) EnsureNamespace(c *fi.Context) error {
return nil
}

func (o*ApplyFederationOperation) ensureFederationNamespace(k8s federation_release_1_4.Interface, name string) (*k8sapiv1.Namespace, error) {
func (o *ApplyFederationOperation) ensureFederationNamespace(k8s federation_release_1_4.Interface, name string) (*k8sapiv1.Namespace, error) {
return mutateNamespace(k8s, name, func(n *k8sapiv1.Namespace) (*k8sapiv1.Namespace, error) {
if n == nil {
n = &k8sapiv1.Namespace{}
Expand Down
14 changes: 7 additions & 7 deletions federation/auth_file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package federation

import (
"strings"
"fmt"
"bytes"
"fmt"
"strings"
)

type AuthFile struct {
Expand Down Expand Up @@ -48,7 +48,7 @@ func ParseAuthFile(data []byte) (*AuthFile, error) {
return parsed, nil
}

func (a*AuthFile) FindUser(user string) *AuthFileLine {
func (a *AuthFile) FindUser(user string) *AuthFileLine {
for _, line := range a.Lines {
if line.User == user {
return line
Expand All @@ -57,7 +57,7 @@ func (a*AuthFile) FindUser(user string) *AuthFileLine {
return nil
}

func (a*AuthFile) Add(line *AuthFileLine) error {
func (a *AuthFile) Add(line *AuthFileLine) error {
existing := a.FindUser(line.User)
if existing != nil {
return fmt.Errorf("user %q already exists in file", line.User)
Expand All @@ -66,7 +66,7 @@ func (a*AuthFile) Add(line *AuthFileLine) error {
return nil
}

func (a*AuthFile) Encode() string {
func (a *AuthFile) Encode() string {
var b bytes.Buffer

for _, line := range a.Lines {
Expand All @@ -82,8 +82,8 @@ func ParseAuthFileLine(line string) (*AuthFileLine, error) {
}
parsed := &AuthFileLine{
Secret: tokens[0],
User: tokens[1],
Role: tokens[2],
User: tokens[1],
Role: tokens[2],
}
return parsed, nil
}
42 changes: 21 additions & 21 deletions federation/federation_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,30 @@ package federation

import (
"fmt"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/errors"
"github.com/golang/glog"
"k8s.io/kops/upup/pkg/kutil"
kopsapi "k8s.io/kops/pkg/apis/kops"
"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
"k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
"k8s.io/kubernetes/federation/apis/federation/v1beta1"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/upup/pkg/kutil"
"k8s.io/kubernetes/federation/apis/federation/v1beta1"
"k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
)

type FederationCluster struct {
FederationNamespace string

ControllerKubernetesClients []release_1_3.Interface
FederationClient federation_release_1_4.Interface
ControllerKubernetesClients []release_1_3.Interface
FederationClient federation_release_1_4.Interface

ClusterSecretName string
ClusterSecretName string

ClusterName string
ApiserverHostname string
ClusterName string
ApiserverHostname string
}

func (o*FederationCluster) Run(cluster *kopsapi.Cluster) error {
func (o *FederationCluster) Run(cluster *kopsapi.Cluster) error {
keyStore, err := registry.KeyStore(cluster)
if err != nil {
return err
Expand All @@ -52,9 +52,9 @@ func (o*FederationCluster) Run(cluster *kopsapi.Cluster) error {
}

k := kutil.CreateKubecfg{
ContextName: cluster.Name,
KeyStore: keyStore,
SecretStore: secretStore,
ContextName: cluster.Name,
KeyStore: keyStore,
SecretStore: secretStore,
KubeMasterIP: cluster.Spec.MasterPublicName,
}

Expand All @@ -64,8 +64,8 @@ func (o*FederationCluster) Run(cluster *kopsapi.Cluster) error {
}

user := kutil.KubectlUser{
ClientCertificateData: kubeconfig.ClientCert,
ClientKeyData : kubeconfig.ClientKey,
ClientCertificateData: kubeconfig.ClientCert,
ClientKeyData: kubeconfig.ClientKey,
}
// username/password or bearer token may be set, but not both
if kubeconfig.KubeBearerToken != "" {
Expand All @@ -88,15 +88,15 @@ func (o*FederationCluster) Run(cluster *kopsapi.Cluster) error {
return nil
}

func (o*FederationCluster) ensureFederationSecret(k8s release_1_3.Interface, caCertData []byte, user kutil.KubectlUser) error {
func (o *FederationCluster) ensureFederationSecret(k8s release_1_3.Interface, caCertData []byte, user kutil.KubectlUser) error {
_, err := mutateSecret(k8s, o.FederationNamespace, o.ClusterSecretName, func(s *v1.Secret) (*v1.Secret, error) {
var kubeconfigData []byte
var err error

{
kubeconfig := &kutil.KubectlConfig{
ApiVersion: "v1",
Kind: "Config",
Kind: "Config",
}

cluster := &kutil.KubectlClusterWithName{
Expand All @@ -122,7 +122,7 @@ func (o*FederationCluster) ensureFederationSecret(k8s release_1_3.Interface, caC
Name: o.ClusterName,
Context: kutil.KubectlContext{
Cluster: cluster.Name,
User: user.Name,
User: user.Name,
},
}
kubeconfig.CurrentContext = o.ClusterName
Expand All @@ -149,7 +149,7 @@ func (o*FederationCluster) ensureFederationSecret(k8s release_1_3.Interface, caC
return err
}

func (o*FederationCluster) ensureFederationCluster(federationClient federation_release_1_4.Interface) error {
func (o *FederationCluster) ensureFederationCluster(federationClient federation_release_1_4.Interface) error {
_, err := mutateCluster(federationClient, o.ClusterName, func(c *v1beta1.Cluster) (*v1beta1.Cluster, error) {
if c == nil {
c = &v1beta1.Cluster{}
Expand Down
Loading

0 comments on commit 9ae1cd3

Please sign in to comment.