Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mirror keystore & secretstore #3411

Merged
merged 3 commits into from
Oct 1, 2017
Merged

Mirror keystore & secretstore #3411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
559d885
Mirror keystore & secretstore
justinsb Sep 17, 2017
e08dfc6
Fix tests: create helper function for PopulateClusterSpec
justinsb Sep 24, 2017
a4a58d2
Mirroring - Fixes from code review
justinsb Oct 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/kops/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kops/cmd/kops/util"
kopsapi "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/pkg/apis/kops/v1alpha1"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/util/pkg/vfs"
Expand Down Expand Up @@ -208,7 +207,7 @@ func RunCreate(f *util.Factory, out io.Writer, c *CreateOptions) error {
return err
}

keyStore, err := registry.KeyStore(cluster)
keyStore, err := clientset.KeyStore(cluster)
if err != nil {
return err
}
Expand Down
13 changes: 11 additions & 2 deletions cmd/kops/create_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ type CreateClusterOptions struct {
// We need VSphereDatastore to support Kubernetes vSphere Cloud Provider (v1.5.3)
// We can remove this once we support higher versions.
VSphereDatastore string

// ConfigBase is the location where we will store the configuration, it defaults to the state store
ConfigBase string
}

func (o *CreateClusterOptions) InitDefaults() {
Expand Down Expand Up @@ -225,6 +228,11 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
cmd.Flags().StringVar(&options.Target, "target", options.Target, "Target - direct, terraform, cloudformation")
cmd.Flags().StringVar(&options.Models, "model", options.Models, "Models to apply (separate multiple models with commas)")

// Configuration / state location
if featureflag.EnableSeparateConfigBase.Enabled() {
cmd.Flags().StringVar(&options.ConfigBase, "config-base", options.ConfigBase, "A cluster-readable location where we mirror configuration information, separate from the state store. Allows for a state store that is not accessible from the cluster.")
}

cmd.Flags().StringVar(&options.Cloud, "cloud", options.Cloud, "Cloud provider to use - gce, aws, vsphere")

cmd.Flags().StringSliceVar(&options.Zones, "zones", options.Zones, "Zones in which to run the cluster")
Expand Down Expand Up @@ -369,6 +377,7 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
}
cluster.Spec.Channel = c.Channel

cluster.Spec.ConfigBase = c.ConfigBase
configBase, err := clientset.ConfigBaseFor(cluster)
if err != nil {
return fmt.Errorf("error building ConfigBase for cluster: %v", err)
Expand Down Expand Up @@ -896,7 +905,7 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
}

assetBuilder := assets.NewAssetBuilder(cluster.Spec.Assets)
fullCluster, err := cloudup.PopulateClusterSpec(cluster, assetBuilder)
fullCluster, err := cloudup.PopulateClusterSpec(clientset, cluster, assetBuilder)
if err != nil {
return err
}
Expand All @@ -921,7 +930,7 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
return fmt.Errorf("error writing updated configuration: %v", err)
}

keyStore, err := registry.KeyStore(cluster)
keyStore, err := clientset.KeyStore(cluster)
if err != nil {
return err
}
Expand Down
8 changes: 6 additions & 2 deletions cmd/kops/create_secret_dockerconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
Expand Down Expand Up @@ -97,7 +96,12 @@ func RunCreateSecretDockerConfig(f *util.Factory, out io.Writer, options *Create
return err
}

secretStore, err := registry.SecretStore(cluster)
clientset, err := f.Clientset()
if err != nil {
return err
}

secretStore, err := clientset.SecretStore(cluster)
if err != nil {
return err
}
Expand Down
8 changes: 6 additions & 2 deletions cmd/kops/create_secret_encryptionconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
Expand Down Expand Up @@ -98,7 +97,12 @@ func RunCreateSecretEncryptionConfig(f *util.Factory, out io.Writer, options *Cr
return err
}

secretStore, err := registry.SecretStore(cluster)
clientset, err := f.Clientset()
if err != nil {
return err
}

secretStore, err := clientset.SecretStore(cluster)
if err != nil {
return err
}
Expand Down
8 changes: 6 additions & 2 deletions cmd/kops/create_secret_sshpublickey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
)
Expand Down Expand Up @@ -99,7 +98,12 @@ func RunCreateSecretPublicKey(f *util.Factory, out io.Writer, options *CreateSec
return err
}

keyStore, err := registry.KeyStore(cluster)
clientset, err := f.Clientset()
if err != nil {
return err
}

keyStore, err := clientset.KeyStore(cluster)
if err != nil {
return err
}
Expand Down
15 changes: 5 additions & 10 deletions cmd/kops/delete_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ import (
"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/pkg/kubeconfig"
"k8s.io/kops/pkg/resources"
"k8s.io/kops/pkg/resources/tracker"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup"
"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kops/util/pkg/vfs"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
)
Expand Down Expand Up @@ -96,8 +94,6 @@ func NewCmdDeleteCluster(f *util.Factory, out io.Writer) *cobra.Command {
type getter func(o interface{}) interface{}

func RunDeleteCluster(f *util.Factory, out io.Writer, options *DeleteClusterOptions) error {
var configBase vfs.Path

clusterName := options.ClusterName
if clusterName == "" {
return fmt.Errorf("--name is required (for safety)")
Expand All @@ -123,11 +119,6 @@ func RunDeleteCluster(f *util.Factory, out io.Writer, options *DeleteClusterOpti
if err != nil {
return err
}

configBase, err = registry.ConfigBase(cluster)
if err != nil {
return err
}
}

wouldDeleteCloudResources := false
Expand Down Expand Up @@ -205,7 +196,11 @@ func RunDeleteCluster(f *util.Factory, out io.Writer, options *DeleteClusterOpti
}
return nil
}
err := registry.DeleteAllClusterState(configBase)
clientset, err := f.Clientset()
if err != nil {
return err
}
err = clientset.DeleteCluster(cluster)
if err != nil {
return fmt.Errorf("error removing cluster from state store: %v", err)
}
Expand Down
10 changes: 7 additions & 3 deletions cmd/kops/delete_secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
Expand Down Expand Up @@ -88,17 +87,22 @@ func RunDeleteSecret(f *util.Factory, out io.Writer, options *DeleteSecretOption
return fmt.Errorf("SecretName is required")
}

clientset, err := f.Clientset()
if err != nil {
return err
}

cluster, err := GetCluster(f, options.ClusterName)
if err != nil {
return err
}

keyStore, err := registry.KeyStore(cluster)
keyStore, err := clientset.KeyStore(cluster)
if err != nil {
return err
}

secretStore, err := registry.SecretStore(cluster)
secretStore, err := clientset.SecretStore(cluster)
if err != nil {
return err
}
Expand Down
13 changes: 8 additions & 5 deletions cmd/kops/describe_secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@ limitations under the License.
package main

import (
"fmt"

"bytes"
"crypto/rsa"
"fmt"
"os"
"sort"
"strings"
"text/tabwriter"

"github.com/spf13/cobra"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
"k8s.io/kubernetes/pkg/util/i18n"
Expand Down Expand Up @@ -77,12 +75,17 @@ func (c *DescribeSecretsCommand) Run(args []string) error {
return err
}

keyStore, err := registry.KeyStore(cluster)
clientset, err := rootCommand.Clientset()
if err != nil {
return err
}

keyStore, err := clientset.KeyStore(cluster)
if err != nil {
return err
}

secretStore, err := registry.SecretStore(cluster)
secretStore, err := clientset.SecretStore(cluster)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/edit_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func RunEditCluster(f *util.Factory, cmd *cobra.Command, args []string, out io.W
}

assetBuilder := assets.NewAssetBuilder(newCluster.Spec.Assets)
fullCluster, err := cloudup.PopulateClusterSpec(newCluster, assetBuilder)
fullCluster, err := cloudup.PopulateClusterSpec(clientset, newCluster, assetBuilder)
if err != nil {
results = editResults{
file: file,
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/edit_instancegroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func RunEditInstanceGroup(f *util.Factory, cmd *cobra.Command, args []string, ou
}

assetBuilder := assets.NewAssetBuilder(cluster.Spec.Assets)
fullCluster, err := cloudup.PopulateClusterSpec(cluster, assetBuilder)
fullCluster, err := cloudup.PopulateClusterSpec(clientset, cluster, assetBuilder)
if err != nil {
return err
}
Expand Down
10 changes: 7 additions & 3 deletions cmd/kops/export_kubecfg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (

"github.com/spf13/cobra"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/pkg/kubeconfig"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
Expand Down Expand Up @@ -73,17 +72,22 @@ func RunExportKubecfg(f *util.Factory, out io.Writer, options *ExportKubecfgOpti
return err
}

clientset, err := rootCommand.Clientset()
if err != nil {
return err
}

cluster, err := rootCommand.Cluster()
if err != nil {
return err
}

keyStore, err := registry.KeyStore(cluster)
keyStore, err := clientset.KeyStore(cluster)
if err != nil {
return err
}

secretStore, err := registry.SecretStore(cluster)
secretStore, err := clientset.SecretStore(cluster)
if err != nil {
return err
}
Expand Down
13 changes: 8 additions & 5 deletions cmd/kops/get_secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ package main

import (
"fmt"
"io"
"os"

"strings"

"github.com/spf13/cobra"
"io"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/util/pkg/tables"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
Expand Down Expand Up @@ -148,12 +146,17 @@ func RunGetSecrets(options *GetSecretsOptions, args []string) error {
return err
}

keyStore, err := registry.KeyStore(cluster)
clientset, err := rootCommand.Clientset()
if err != nil {
return err
}

keyStore, err := clientset.KeyStore(cluster)
if err != nil {
return err
}

secretStore, err := registry.SecretStore(cluster)
secretStore, err := clientset.SecretStore(cluster)
if err != nil {
return err
}
Expand Down
7 changes: 3 additions & 4 deletions cmd/kops/update_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/registry"
"k8s.io/kops/pkg/kubeconfig"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup"
Expand Down Expand Up @@ -144,17 +143,17 @@ func RunUpdateCluster(f *util.Factory, clusterName string, out io.Writer, c *Upd
return err
}

keyStore, err := registry.KeyStore(cluster)
clientset, err := f.Clientset()
if err != nil {
return err
}

secretStore, err := registry.SecretStore(cluster)
keyStore, err := clientset.KeyStore(cluster)
if err != nil {
return err
}

clientset, err := f.Clientset()
secretStore, err := clientset.SecretStore(cluster)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/kops/upgrade_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ func (c *UpgradeClusterCmd) Run(args []string) error {
}

assetBuilder := assets.NewAssetBuilder(cluster.Spec.Assets)
fullCluster, err := cloudup.PopulateClusterSpec(cluster, assetBuilder)
fullCluster, err := cloudup.PopulateClusterSpec(clientset, cluster, assetBuilder)
if err != nil {
return err
}
Expand Down
Loading