Merge pull request #6887 from justinsb/kops_apigroup

Start CRDification: Change apigroup to kops.k8s.io
This commit is contained in:
Kubernetes Prow Robot 2019-05-07 07:13:50 -07:00 committed by GitHub
commit a8a1f7e33d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
124 changed files with 639 additions and 321 deletions

View File

@ -216,7 +216,7 @@ func runCreateClusterIntegrationTest(t *testing.T, srcDir string, version string
for _, cluster := range clusters.Items { for _, cluster := range clusters.Items {
cluster.ObjectMeta.CreationTimestamp = MagicTimestamp cluster.ObjectMeta.CreationTimestamp = MagicTimestamp
actualYAMLBytes, err := kopscodecs.ToVersionedYamlWithVersion(&cluster, schema.GroupVersion{Group: "kops", Version: version}) actualYAMLBytes, err := kopscodecs.ToVersionedYamlWithVersion(&cluster, schema.GroupVersion{Group: "kops.k8s.io", Version: version})
if err != nil { if err != nil {
t.Fatalf("unexpected error serializing cluster: %v", err) t.Fatalf("unexpected error serializing cluster: %v", err)
} }
@ -235,7 +235,7 @@ func runCreateClusterIntegrationTest(t *testing.T, srcDir string, version string
for _, ig := range instanceGroups.Items { for _, ig := range instanceGroups.Items {
ig.ObjectMeta.CreationTimestamp = MagicTimestamp ig.ObjectMeta.CreationTimestamp = MagicTimestamp
actualYAMLBytes, err := kopscodecs.ToVersionedYamlWithVersion(&ig, schema.GroupVersion{Group: "kops", Version: version}) actualYAMLBytes, err := kopscodecs.ToVersionedYamlWithVersion(&ig, schema.GroupVersion{Group: "kops.k8s.io", Version: version})
if err != nil { if err != nil {
t.Fatalf("unexpected error serializing InstanceGroup: %v", err) t.Fatalf("unexpected error serializing InstanceGroup: %v", err)
} }

View File

@ -77,6 +77,7 @@ func TestHighAvailabilityGCE(t *testing.T) {
// TestComplex runs the test on a more complex configuration, intended to hit more of the edge cases // TestComplex runs the test on a more complex configuration, intended to hit more of the edge cases
func TestComplex(t *testing.T) { func TestComplex(t *testing.T) {
runTestAWS(t, "complex.example.com", "complex", "v1alpha2", false, 1, true, nil) runTestAWS(t, "complex.example.com", "complex", "v1alpha2", false, 1, true, nil)
runTestAWS(t, "complex.example.com", "complex", "legacy-v1alpha2", false, 1, true, nil)
} }
// TestMinimalCloudformation runs the test on a minimum configuration, similar to kops create cluster minimal.example.com --zones us-west-1a // TestMinimalCloudformation runs the test on a minimum configuration, similar to kops create cluster minimal.example.com --zones us-west-1a

View File

@ -7,7 +7,7 @@
```bdocs-tab:example_yaml ```bdocs-tab:example_yaml
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2019-12-10T22:42:27Z" creationTimestamp: "2019-12-10T22:42:27Z"

View File

@ -7,7 +7,7 @@
```bdocs-tab:example_yaml ```bdocs-tab:example_yaml
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: null creationTimestamp: null

View File

@ -1,5 +1,5 @@
sample: | sample: |
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2019-12-10T22:42:27Z" creationTimestamp: "2019-12-10T22:42:27Z"

View File

@ -1,5 +1,5 @@
sample: | sample: |
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: null creationTimestamp: null

View File

@ -20,7 +20,7 @@ authentication:
For example: For example:
``` ```
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
name: cluster.example.com name: cluster.example.com
@ -48,7 +48,7 @@ authentication:
For example: For example:
``` ```
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
name: cluster.example.com name: cluster.example.com

View File

@ -31,7 +31,7 @@ kops edit ig bastions --name $KOPS_NAME
You should now be able to edit and configure your bastion instance group. You should now be able to edit and configure your bastion instance group.
```yaml ```yaml
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-05T13:37:07Z" creationTimestamp: "2017-01-05T13:37:07Z"

View File

@ -9,7 +9,7 @@ This document details the template language used.
The file passed as `--template` must be a [go template](https://golang.org/pkg/text/template/). Example: The file passed as `--template` must be a [go template](https://golang.org/pkg/text/template/). Example:
```yaml ```yaml
# File cluster.tmpl.yaml # File cluster.tmpl.yaml
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
labels: labels:
@ -105,7 +105,7 @@ $ kops toolbox template --values dev.yaml --template cluster.yaml --template ins
The example below assumes you have placed the appropriate files i.e. *(nodes.json, master.json etc)* in to the snippets directory. Note, the namespace of the snippets are flat and always the basename() of the file path; so `snippets/components/docker.options` is still referred to as 'docker.options'. The example below assumes you have placed the appropriate files i.e. *(nodes.json, master.json etc)* in to the snippets directory. Note, the namespace of the snippets are flat and always the basename() of the file path; so `snippets/components/docker.options` is still referred to as 'docker.options'.
```YAML ```YAML
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
name: {{ .environment }}.{{ .dns_zone }} name: {{ .environment }}.{{ .dns_zone }}

View File

@ -686,7 +686,7 @@ kops edit ig nodes
An editor (whatever you have on the $EDITOR shell variable) will open with the following text: An editor (whatever you have on the $EDITOR shell variable) will open with the following text:
``` ```
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-09-06T13:40:39Z creationTimestamp: 2017-09-06T13:40:39Z
@ -708,7 +708,7 @@ spec:
Let's change minSize and maxSize to "3" Let's change minSize and maxSize to "3"
``` ```
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-09-06T13:40:39Z creationTimestamp: 2017-09-06T13:40:39Z

View File

@ -142,7 +142,7 @@ kops create instancegroup bastions --role Bastion --subnet utility-us-east-1a --
You'll see the following output in your editor when you can change your bastion group size and add more networks. You'll see the following output in your editor when you can change your bastion group size and add more networks.
```bash ```bash
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: null creationTimestamp: null
@ -320,7 +320,7 @@ kops edit ig bastions --name ${NAME}
And change minSize/maxSize to 3 (3 instances) and add more subnets: And change minSize/maxSize to 3 (3 instances) and add more subnets:
```bash ```bash
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-08-28T17:05:23Z creationTimestamp: 2017-08-28T17:05:23Z

View File

@ -431,7 +431,7 @@ If you need to add tags on auto scaling groups or instances (propagate ASG tags)
``` ```
# Example for nodes # Example for nodes
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
labels: labels:
@ -459,7 +459,7 @@ will rescale the ASG without warning.
``` ```
# Example for nodes # Example for nodes
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
labels: labels:
@ -489,7 +489,7 @@ load balancers and Network load balancers.
``` ```
# Example ingress nodes # Example ingress nodes
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
labels: labels:
@ -513,7 +513,7 @@ Detailed-Monitoring will cause the monitoring data to be available every 1 minut
``` ```
# Example for nodes # Example for nodes
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
labels: labels:

View File

@ -57,7 +57,7 @@ NOTE: If you run `kops get cluster $NAME -o yaml > $NAME.yaml`, you will only ge
The following is the contents of the exported YAML file. The following is the contents of the exported YAML file.
```yaml ```yaml
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-05-04T23:21:47Z creationTimestamp: 2017-05-04T23:21:47Z
@ -134,7 +134,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-05-04T23:21:48Z creationTimestamp: 2017-05-04T23:21:48Z
@ -155,7 +155,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-05-04T23:21:47Z creationTimestamp: 2017-05-04T23:21:47Z
@ -174,7 +174,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-05-04T23:21:47Z creationTimestamp: 2017-05-04T23:21:47Z
@ -193,7 +193,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-05-04T23:21:48Z creationTimestamp: 2017-05-04T23:21:48Z
@ -212,7 +212,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-05-04T23:21:48Z creationTimestamp: 2017-05-04T23:21:48Z
@ -236,7 +236,7 @@ spec:
With the above YAML file, a user can add configurations that are not available via the command line. For instance, you can add a `maxPrice` value to a new instance group and use spot instances. Also add node and cloud labels for the new instance group. With the above YAML file, a user can add configurations that are not available via the command line. For instance, you can add a `maxPrice` value to a new instance group and use spot instances. Also add node and cloud labels for the new instance group.
```yaml ```yaml
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-05-04T23:21:48Z creationTimestamp: 2017-05-04T23:21:48Z
@ -289,7 +289,7 @@ Please refer to the rolling-update [documentation](cli/kops_rolling-update_clust
### Cluster Spec ### Cluster Spec
```yaml ```yaml
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-05-04T23:21:47Z creationTimestamp: 2017-05-04T23:21:47Z
@ -322,7 +322,7 @@ This command prints the entire YAML configuration. But _do not_ use the full doc
### Instance Groups ### Instance Groups
```yaml ```yaml
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-05-04T23:21:48Z creationTimestamp: 2017-05-04T23:21:48Z

View File

@ -28,7 +28,7 @@ Note: it is currently not possible to delete secrets from the keystore that have
### adding ssh credential from spec file ### adding ssh credential from spec file
```bash ```bash
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: SSHCredential kind: SSHCredential
metadata: metadata:
labels: labels:

View File

@ -14,7 +14,7 @@ This is due to the lifecycle overrides being used to prevent creation of the Sec
To do this first specify the Security Groups for the ELB (if you are using a LB) and Instance Groups To do this first specify the Security Groups for the ELB (if you are using a LB) and Instance Groups
Example: Example:
```yaml ```yaml
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"
@ -28,7 +28,7 @@ spec:
. .
. .
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"

View File

@ -62,7 +62,7 @@ You can see the details of your Cluster object by doing:
`> kops get cluster --state ${KOPS_STATE_STORE}/ simple.k8s.local -oyaml` `> kops get cluster --state ${KOPS_STATE_STORE}/ simple.k8s.local -oyaml`
``` ```
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-10-03T05:07:27Z creationTimestamp: 2017-10-03T05:07:27Z

View File

@ -18,7 +18,7 @@ controlled at the cluster level. So instead of `kops edit ig <name>`, we `kops
# and an empty file will abort the edit. If an error occurs while saving this file will be # and an empty file will abort the edit. If an error occurs while saving this file will be
# reopened with the relevant failures. # reopened with the relevant failures.
# #
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-10-04T03:52:25Z creationTimestamp: 2017-10-04T03:52:25Z

View File

@ -22,7 +22,7 @@ should be very familiar to you if you've used `kubectl edit`). `kops edit ig no
the InstanceGroup in your editor, looking a bit like this: the InstanceGroup in your editor, looking a bit like this:
``` ```
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-10-03T15:17:31Z creationTimestamp: 2017-10-03T15:17:31Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"
@ -43,7 +43,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"

View File

@ -16,5 +16,5 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +groupName=kops // +groupName=kops.k8s.io
package kops // import "k8s.io/kops/pkg/apis/kops" package kops // import "k8s.io/kops/pkg/apis/kops"

View File

@ -38,7 +38,7 @@ var (
//var ParameterCodec = runtime.NewParameterCodec(Scheme) //var ParameterCodec = runtime.NewParameterCodec(Scheme)
// GroupName is the group name use in this package // GroupName is the group name use in this package
const GroupName = "kops" const GroupName = "kops.k8s.io"
// SchemeGroupVersion is the group version used to register these objects // SchemeGroupVersion is the group version used to register these objects
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}

View File

@ -19,5 +19,5 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen=TypeMeta
// +groupName=kops // +groupName=kops.k8s.io
package v1alpha1 package v1alpha1

View File

@ -36,7 +36,7 @@ func init() {
} }
// GroupName is the group name use in this package // GroupName is the group name use in this package
const GroupName = "kops" const GroupName = "kops.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}

View File

@ -19,5 +19,5 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen=TypeMeta
// +groupName=kops // +groupName=kops.k8s.io
package v1alpha2 // import "k8s.io/kops/pkg/apis/kops/v1alpha2" package v1alpha2 // import "k8s.io/kops/pkg/apis/kops/v1alpha2"

View File

@ -36,7 +36,7 @@ func init() {
} }
// GroupName is the group name use in this package // GroupName is the group name use in this package
const GroupName = "kops" const GroupName = "kops.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"}

View File

@ -34,9 +34,9 @@ type FakeClusters struct {
ns string ns string
} }
var clustersResource = schema.GroupVersionResource{Group: "kops", Version: "", Resource: "clusters"} var clustersResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "", Resource: "clusters"}
var clustersKind = schema.GroupVersionKind{Group: "kops", Version: "", Kind: "Cluster"} var clustersKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "", Kind: "Cluster"}
// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any. // Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any.
func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *kops.Cluster, err error) { func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *kops.Cluster, err error) {

View File

@ -34,9 +34,9 @@ type FakeInstanceGroups struct {
ns string ns string
} }
var instancegroupsResource = schema.GroupVersionResource{Group: "kops", Version: "", Resource: "instancegroups"} var instancegroupsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "", Resource: "instancegroups"}
var instancegroupsKind = schema.GroupVersionKind{Group: "kops", Version: "", Kind: "InstanceGroup"} var instancegroupsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "", Kind: "InstanceGroup"}
// Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any. // Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any.
func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *kops.InstanceGroup, err error) { func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *kops.InstanceGroup, err error) {

View File

@ -34,9 +34,9 @@ type FakeKeysets struct {
ns string ns string
} }
var keysetsResource = schema.GroupVersionResource{Group: "kops", Version: "", Resource: "keysets"} var keysetsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "", Resource: "keysets"}
var keysetsKind = schema.GroupVersionKind{Group: "kops", Version: "", Kind: "Keyset"} var keysetsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "", Kind: "Keyset"}
// Get takes name of the keyset, and returns the corresponding keyset object, and an error if there is any. // Get takes name of the keyset, and returns the corresponding keyset object, and an error if there is any.
func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *kops.Keyset, err error) { func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *kops.Keyset, err error) {

View File

@ -34,9 +34,9 @@ type FakeSSHCredentials struct {
ns string ns string
} }
var sshcredentialsResource = schema.GroupVersionResource{Group: "kops", Version: "", Resource: "sshcredentials"} var sshcredentialsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "", Resource: "sshcredentials"}
var sshcredentialsKind = schema.GroupVersionKind{Group: "kops", Version: "", Kind: "SSHCredential"} var sshcredentialsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "", Kind: "SSHCredential"}
// Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any. // Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any.
func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *kops.SSHCredential, err error) { func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *kops.SSHCredential, err error) {

View File

@ -31,7 +31,7 @@ type KopsInterface interface {
SSHCredentialsGetter SSHCredentialsGetter
} }
// KopsClient is used to interact with features provided by the kops group. // KopsClient is used to interact with features provided by the kops.k8s.io group.
type KopsClient struct { type KopsClient struct {
restClient rest.Interface restClient rest.Interface
} }
@ -85,8 +85,8 @@ func setConfigDefaults(config *rest.Config) error {
if config.UserAgent == "" { if config.UserAgent == "" {
config.UserAgent = rest.DefaultKubernetesUserAgent() config.UserAgent = rest.DefaultKubernetesUserAgent()
} }
if config.GroupVersion == nil || config.GroupVersion.Group != scheme.Scheme.PrioritizedVersionsForGroup("kops")[0].Group { if config.GroupVersion == nil || config.GroupVersion.Group != scheme.Scheme.PrioritizedVersionsForGroup("kops.k8s.io")[0].Group {
gv := scheme.Scheme.PrioritizedVersionsForGroup("kops")[0] gv := scheme.Scheme.PrioritizedVersionsForGroup("kops.k8s.io")[0]
config.GroupVersion = &gv config.GroupVersion = &gv
} }
config.NegotiatedSerializer = scheme.Codecs config.NegotiatedSerializer = scheme.Codecs

View File

@ -34,9 +34,9 @@ type FakeClusters struct {
ns string ns string
} }
var clustersResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha1", Resource: "clusters"} var clustersResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha1", Resource: "clusters"}
var clustersKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha1", Kind: "Cluster"} var clustersKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha1", Kind: "Cluster"}
// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any. // Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any.
func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha1.Cluster, err error) { func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha1.Cluster, err error) {

View File

@ -34,9 +34,9 @@ type FakeInstanceGroups struct {
ns string ns string
} }
var instancegroupsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha1", Resource: "instancegroups"} var instancegroupsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha1", Resource: "instancegroups"}
var instancegroupsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha1", Kind: "InstanceGroup"} var instancegroupsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha1", Kind: "InstanceGroup"}
// Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any. // Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any.
func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha1.InstanceGroup, err error) { func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha1.InstanceGroup, err error) {

View File

@ -34,9 +34,9 @@ type FakeSSHCredentials struct {
ns string ns string
} }
var sshcredentialsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha1", Resource: "sshcredentials"} var sshcredentialsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha1", Resource: "sshcredentials"}
var sshcredentialsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha1", Kind: "SSHCredential"} var sshcredentialsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha1", Kind: "SSHCredential"}
// Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any. // Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any.
func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha1.SSHCredential, err error) { func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha1.SSHCredential, err error) {

View File

@ -32,7 +32,7 @@ type KopsV1alpha1Interface interface {
SSHCredentialsGetter SSHCredentialsGetter
} }
// KopsV1alpha1Client is used to interact with features provided by the kops group. // KopsV1alpha1Client is used to interact with features provided by the kops.k8s.io group.
type KopsV1alpha1Client struct { type KopsV1alpha1Client struct {
restClient rest.Interface restClient rest.Interface
} }

View File

@ -34,9 +34,9 @@ type FakeClusters struct {
ns string ns string
} }
var clustersResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha2", Resource: "clusters"} var clustersResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha2", Resource: "clusters"}
var clustersKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha2", Kind: "Cluster"} var clustersKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha2", Kind: "Cluster"}
// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any. // Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any.
func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha2.Cluster, err error) { func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha2.Cluster, err error) {

View File

@ -34,9 +34,9 @@ type FakeInstanceGroups struct {
ns string ns string
} }
var instancegroupsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha2", Resource: "instancegroups"} var instancegroupsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha2", Resource: "instancegroups"}
var instancegroupsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha2", Kind: "InstanceGroup"} var instancegroupsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha2", Kind: "InstanceGroup"}
// Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any. // Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any.
func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha2.InstanceGroup, err error) { func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha2.InstanceGroup, err error) {

View File

@ -34,9 +34,9 @@ type FakeKeysets struct {
ns string ns string
} }
var keysetsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha2", Resource: "keysets"} var keysetsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha2", Resource: "keysets"}
var keysetsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha2", Kind: "Keyset"} var keysetsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha2", Kind: "Keyset"}
// Get takes name of the keyset, and returns the corresponding keyset object, and an error if there is any. // Get takes name of the keyset, and returns the corresponding keyset object, and an error if there is any.
func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *v1alpha2.Keyset, err error) { func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *v1alpha2.Keyset, err error) {

View File

@ -34,9 +34,9 @@ type FakeSSHCredentials struct {
ns string ns string
} }
var sshcredentialsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha2", Resource: "sshcredentials"} var sshcredentialsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha2", Resource: "sshcredentials"}
var sshcredentialsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha2", Kind: "SSHCredential"} var sshcredentialsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha2", Kind: "SSHCredential"}
// Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any. // Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any.
func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha2.SSHCredential, err error) { func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha2.SSHCredential, err error) {

View File

@ -33,7 +33,7 @@ type KopsV1alpha2Interface interface {
SSHCredentialsGetter SSHCredentialsGetter
} }
// KopsV1alpha2Client is used to interact with features provided by the kops group. // KopsV1alpha2Client is used to interact with features provided by the kops.k8s.io group.
type KopsV1alpha2Client struct { type KopsV1alpha2Client struct {
restClient rest.Interface restClient rest.Interface
} }

View File

@ -34,9 +34,9 @@ type FakeClusters struct {
ns string ns string
} }
var clustersResource = schema.GroupVersionResource{Group: "kops", Version: "", Resource: "clusters"} var clustersResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "", Resource: "clusters"}
var clustersKind = schema.GroupVersionKind{Group: "kops", Version: "", Kind: "Cluster"} var clustersKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "", Kind: "Cluster"}
// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any. // Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any.
func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *kops.Cluster, err error) { func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *kops.Cluster, err error) {

View File

@ -34,9 +34,9 @@ type FakeInstanceGroups struct {
ns string ns string
} }
var instancegroupsResource = schema.GroupVersionResource{Group: "kops", Version: "", Resource: "instancegroups"} var instancegroupsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "", Resource: "instancegroups"}
var instancegroupsKind = schema.GroupVersionKind{Group: "kops", Version: "", Kind: "InstanceGroup"} var instancegroupsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "", Kind: "InstanceGroup"}
// Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any. // Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any.
func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *kops.InstanceGroup, err error) { func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *kops.InstanceGroup, err error) {

View File

@ -34,9 +34,9 @@ type FakeKeysets struct {
ns string ns string
} }
var keysetsResource = schema.GroupVersionResource{Group: "kops", Version: "", Resource: "keysets"} var keysetsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "", Resource: "keysets"}
var keysetsKind = schema.GroupVersionKind{Group: "kops", Version: "", Kind: "Keyset"} var keysetsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "", Kind: "Keyset"}
// Get takes name of the keyset, and returns the corresponding keyset object, and an error if there is any. // Get takes name of the keyset, and returns the corresponding keyset object, and an error if there is any.
func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *kops.Keyset, err error) { func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *kops.Keyset, err error) {

View File

@ -34,9 +34,9 @@ type FakeSSHCredentials struct {
ns string ns string
} }
var sshcredentialsResource = schema.GroupVersionResource{Group: "kops", Version: "", Resource: "sshcredentials"} var sshcredentialsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "", Resource: "sshcredentials"}
var sshcredentialsKind = schema.GroupVersionKind{Group: "kops", Version: "", Kind: "SSHCredential"} var sshcredentialsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "", Kind: "SSHCredential"}
// Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any. // Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any.
func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *kops.SSHCredential, err error) { func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *kops.SSHCredential, err error) {

View File

@ -31,7 +31,7 @@ type KopsInterface interface {
SSHCredentialsGetter SSHCredentialsGetter
} }
// KopsClient is used to interact with features provided by the kops group. // KopsClient is used to interact with features provided by the kops.k8s.io group.
type KopsClient struct { type KopsClient struct {
restClient rest.Interface restClient rest.Interface
} }
@ -85,8 +85,8 @@ func setConfigDefaults(config *rest.Config) error {
if config.UserAgent == "" { if config.UserAgent == "" {
config.UserAgent = rest.DefaultKubernetesUserAgent() config.UserAgent = rest.DefaultKubernetesUserAgent()
} }
if config.GroupVersion == nil || config.GroupVersion.Group != scheme.Scheme.PrioritizedVersionsForGroup("kops")[0].Group { if config.GroupVersion == nil || config.GroupVersion.Group != scheme.Scheme.PrioritizedVersionsForGroup("kops.k8s.io")[0].Group {
gv := scheme.Scheme.PrioritizedVersionsForGroup("kops")[0] gv := scheme.Scheme.PrioritizedVersionsForGroup("kops.k8s.io")[0]
config.GroupVersion = &gv config.GroupVersion = &gv
} }
config.NegotiatedSerializer = scheme.Codecs config.NegotiatedSerializer = scheme.Codecs

View File

@ -34,9 +34,9 @@ type FakeClusters struct {
ns string ns string
} }
var clustersResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha1", Resource: "clusters"} var clustersResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha1", Resource: "clusters"}
var clustersKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha1", Kind: "Cluster"} var clustersKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha1", Kind: "Cluster"}
// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any. // Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any.
func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha1.Cluster, err error) { func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha1.Cluster, err error) {

View File

@ -34,9 +34,9 @@ type FakeInstanceGroups struct {
ns string ns string
} }
var instancegroupsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha1", Resource: "instancegroups"} var instancegroupsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha1", Resource: "instancegroups"}
var instancegroupsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha1", Kind: "InstanceGroup"} var instancegroupsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha1", Kind: "InstanceGroup"}
// Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any. // Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any.
func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha1.InstanceGroup, err error) { func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha1.InstanceGroup, err error) {

View File

@ -34,9 +34,9 @@ type FakeSSHCredentials struct {
ns string ns string
} }
var sshcredentialsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha1", Resource: "sshcredentials"} var sshcredentialsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha1", Resource: "sshcredentials"}
var sshcredentialsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha1", Kind: "SSHCredential"} var sshcredentialsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha1", Kind: "SSHCredential"}
// Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any. // Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any.
func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha1.SSHCredential, err error) { func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha1.SSHCredential, err error) {

View File

@ -32,7 +32,7 @@ type KopsV1alpha1Interface interface {
SSHCredentialsGetter SSHCredentialsGetter
} }
// KopsV1alpha1Client is used to interact with features provided by the kops group. // KopsV1alpha1Client is used to interact with features provided by the kops.k8s.io group.
type KopsV1alpha1Client struct { type KopsV1alpha1Client struct {
restClient rest.Interface restClient rest.Interface
} }

View File

@ -34,9 +34,9 @@ type FakeClusters struct {
ns string ns string
} }
var clustersResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha2", Resource: "clusters"} var clustersResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha2", Resource: "clusters"}
var clustersKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha2", Kind: "Cluster"} var clustersKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha2", Kind: "Cluster"}
// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any. // Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any.
func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha2.Cluster, err error) { func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha2.Cluster, err error) {

View File

@ -34,9 +34,9 @@ type FakeInstanceGroups struct {
ns string ns string
} }
var instancegroupsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha2", Resource: "instancegroups"} var instancegroupsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha2", Resource: "instancegroups"}
var instancegroupsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha2", Kind: "InstanceGroup"} var instancegroupsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha2", Kind: "InstanceGroup"}
// Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any. // Get takes name of the instanceGroup, and returns the corresponding instanceGroup object, and an error if there is any.
func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha2.InstanceGroup, err error) { func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha2.InstanceGroup, err error) {

View File

@ -34,9 +34,9 @@ type FakeKeysets struct {
ns string ns string
} }
var keysetsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha2", Resource: "keysets"} var keysetsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha2", Resource: "keysets"}
var keysetsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha2", Kind: "Keyset"} var keysetsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha2", Kind: "Keyset"}
// Get takes name of the keyset, and returns the corresponding keyset object, and an error if there is any. // Get takes name of the keyset, and returns the corresponding keyset object, and an error if there is any.
func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *v1alpha2.Keyset, err error) { func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *v1alpha2.Keyset, err error) {

View File

@ -34,9 +34,9 @@ type FakeSSHCredentials struct {
ns string ns string
} }
var sshcredentialsResource = schema.GroupVersionResource{Group: "kops", Version: "v1alpha2", Resource: "sshcredentials"} var sshcredentialsResource = schema.GroupVersionResource{Group: "kops.k8s.io", Version: "v1alpha2", Resource: "sshcredentials"}
var sshcredentialsKind = schema.GroupVersionKind{Group: "kops", Version: "v1alpha2", Kind: "SSHCredential"} var sshcredentialsKind = schema.GroupVersionKind{Group: "kops.k8s.io", Version: "v1alpha2", Kind: "SSHCredential"}
// Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any. // Get takes name of the sSHCredential, and returns the corresponding sSHCredential object, and an error if there is any.
func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha2.SSHCredential, err error) { func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha2.SSHCredential, err error) {

View File

@ -33,7 +33,7 @@ type KopsV1alpha2Interface interface {
SSHCredentialsGetter SSHCredentialsGetter
} }
// KopsV1alpha2Client is used to interact with features provided by the kops group. // KopsV1alpha2Client is used to interact with features provided by the kops.k8s.io group.
type KopsV1alpha2Client struct { type KopsV1alpha2Client struct {
restClient rest.Interface restClient rest.Interface
} }

View File

@ -19,6 +19,7 @@ package kopscodecs
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"regexp"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@ -86,8 +87,43 @@ func ToVersionedJSONWithVersion(obj runtime.Object, version runtime.GroupVersion
// Decode decodes the specified data, with the specified default version // Decode decodes the specified data, with the specified default version
func Decode(data []byte, defaultReadVersion *schema.GroupVersionKind) (runtime.Object, *schema.GroupVersionKind, error) { func Decode(data []byte, defaultReadVersion *schema.GroupVersionKind) (runtime.Object, *schema.GroupVersionKind, error) {
data = rewriteAPIGroup(data)
decoder := decoder() decoder := decoder()
object, gvk, err := decoder.Decode(data, defaultReadVersion, nil) object, gvk, err := decoder.Decode(data, defaultReadVersion, nil)
return object, gvk, err return object, gvk, err
} }
// rewriteAPIGroup rewrites the apiVersion from kops/v1alphaN -> kops.k8s.io/v1alphaN
// This allows us to register as a normal CRD
func rewriteAPIGroup(y []byte) []byte {
changed := false
lines := bytes.Split(y, []byte("\n"))
for i := range lines {
if !bytes.Contains(lines[i], []byte("apiVersion:")) {
continue
}
{
re := regexp.MustCompile("kops/v1alpha1")
if re.Match(lines[i]) {
lines[i] = re.ReplaceAllLiteral(lines[i], []byte("kops.k8s.io/v1alpha1"))
changed = true
}
}
{
re := regexp.MustCompile("kops/v1alpha2")
lines[i] = re.ReplaceAllLiteral(lines[i], []byte("kops.k8s.io/v1alpha2"))
changed = true
}
}
if changed {
y = bytes.Join(lines, []byte("\n"))
}
return y
}

View File

@ -47,7 +47,7 @@ func TestToVersionedYaml(t *testing.T) {
}, },
}, },
expected: heredoc.Doc(` expected: heredoc.Doc(`
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"
@ -48,7 +48,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"
@ -67,7 +67,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"

View File

@ -34,7 +34,7 @@ func TestSerializeEmptyCluster(t *testing.T) {
} }
yamlString := string(yaml) yamlString := string(yaml)
expected := `apiVersion: kops/v1alpha2 expected := `apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: null creationTimestamp: null

View File

@ -38,6 +38,12 @@ func TestConversionMinimal(t *testing.T) {
runTest(t, "minimal", "v1alpha0", "v1alpha1") runTest(t, "minimal", "v1alpha0", "v1alpha1")
runTest(t, "minimal", "v1alpha0", "v1alpha2") runTest(t, "minimal", "v1alpha0", "v1alpha2")
runTest(t, "minimal", "legacy-v1alpha1", "v1alpha1")
runTest(t, "minimal", "legacy-v1alpha1", "v1alpha2")
runTest(t, "minimal", "legacy-v1alpha2", "v1alpha1")
runTest(t, "minimal", "legacy-v1alpha2", "v1alpha2")
} }
func runTest(t *testing.T, srcDir string, fromVersion string, toVersion string) { func runTest(t *testing.T, srcDir string, fromVersion string, toVersion string) {
@ -82,7 +88,7 @@ func runTest(t *testing.T, srcDir string, fromVersion string, toVersion string)
t.Fatalf("error parsing file %q: %v", sourcePath, err) t.Fatalf("error parsing file %q: %v", sourcePath, err)
} }
expectVersion := fromVersion expectVersion := strings.TrimPrefix(fromVersion, "legacy-")
if expectVersion == "v1alpha0" { if expectVersion == "v1alpha0" {
// Our version before we had v1alpha1 // Our version before we had v1alpha1
expectVersion = "v1alpha1" expectVersion = "v1alpha1"

View File

@ -0,0 +1,89 @@
apiVersion: kops/v1alpha1
kind: Cluster
metadata:
creationTimestamp: 2016-12-10T22:42:27Z
name: minimal.example.com
spec:
additionalSans:
- proxy.api.minimal.example.com
addons:
- manifest: s3://somebucket/example.yaml
adminAccess:
- 0.0.0.0/0
api:
dns: {}
authorization:
alwaysAllow: {}
channel: stable
cloudProvider: aws
configBase: memfs://clusters.example.com/minimal.example.com
etcdClusters:
- cpuRequest: 200m
etcdMembers:
- name: us-test-1a
zone: us-test-1a
memoryRequest: 100Mi
name: main
- cpuRequest: 200m
etcdMembers:
- name: us-test-1a
zone: us-test-1a
memoryRequest: 100Mi
name: events
iam:
legacy: true
kubernetesVersion: v1.4.12
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
networking:
kubenet: {}
nonMasqueradeCIDR: 100.64.0.0/10
topology:
dns:
type: Public
masters: public
nodes: public
zones:
- cidr: 172.20.32.0/19
name: us-test-1a
---
apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup
metadata:
creationTimestamp: 2016-12-10T22:42:28Z
labels:
kops.k8s.io/cluster: minimal.example.com
name: nodes
spec:
associatePublicIp: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: t2.medium
maxSize: 2
minSize: 2
role: Node
zones:
- us-test-1a
---
apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup
metadata:
creationTimestamp: 2016-12-10T22:42:28Z
labels:
kops.k8s.io/cluster: minimal.example.com
name: master-us-test-1a
spec:
associatePublicIp: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: m3.medium
maxSize: 1
minSize: 1
role: Master
zones:
- us-test-1a

View File

@ -0,0 +1,91 @@
apiVersion: kops/v1alpha2
kind: Cluster
metadata:
creationTimestamp: 2016-12-10T22:42:27Z
name: minimal.example.com
spec:
additionalSans:
- proxy.api.minimal.example.com
addons:
- manifest: s3://somebucket/example.yaml
api:
dns: {}
authorization:
alwaysAllow: {}
channel: stable
cloudProvider: aws
configBase: memfs://clusters.example.com/minimal.example.com
etcdClusters:
- cpuRequest: 200m
etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
memoryRequest: 100Mi
name: main
- cpuRequest: 200m
etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
memoryRequest: 100Mi
name: events
iam:
legacy: true
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.4.12
masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
networking:
kubenet: {}
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
type: Public
zone: us-test-1a
topology:
dns:
type: Public
masters: public
nodes: public
---
apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: 2016-12-10T22:42:28Z
labels:
kops.k8s.io/cluster: minimal.example.com
name: nodes
spec:
associatePublicIp: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: t2.medium
maxSize: 2
minSize: 2
role: Node
subnets:
- us-test-1a
---
apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: 2016-12-10T22:42:28Z
labels:
kops.k8s.io/cluster: minimal.example.com
name: master-us-test-1a
spec:
associatePublicIp: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: m3.medium
maxSize: 1
minSize: 1
role: Master
subnets:
- us-test-1a

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2016-12-10T22:42:27Z creationTimestamp: 2016-12-10T22:42:27Z
@ -50,7 +50,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2016-12-10T22:42:28Z creationTimestamp: 2016-12-10T22:42:28Z
@ -69,7 +69,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2016-12-10T22:42:28Z creationTimestamp: 2016-12-10T22:42:28Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2016-12-10T22:42:27Z creationTimestamp: 2016-12-10T22:42:27Z
@ -54,7 +54,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2016-12-10T22:42:28Z creationTimestamp: 2016-12-10T22:42:28Z
@ -73,7 +73,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2016-12-10T22:42:28Z creationTimestamp: 2016-12-10T22:42:28Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -50,7 +50,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -70,7 +70,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -58,7 +58,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -78,7 +78,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -98,7 +98,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -118,7 +118,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -66,7 +66,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -86,7 +86,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -106,7 +106,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -126,7 +126,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -64,7 +64,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -84,7 +84,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -104,7 +104,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -124,7 +124,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -72,7 +72,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -92,7 +92,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -112,7 +112,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -132,7 +132,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -57,7 +57,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -79,7 +79,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -101,7 +101,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -123,7 +123,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -70,7 +70,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -90,7 +90,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -110,7 +110,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -130,7 +130,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -150,7 +150,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -170,7 +170,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -52,7 +52,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -72,7 +72,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -92,7 +92,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -58,7 +58,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -78,7 +78,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -98,7 +98,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -48,7 +48,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -68,7 +68,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -52,7 +52,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -72,7 +72,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -52,7 +52,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -72,7 +72,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -92,7 +92,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -58,7 +58,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -78,7 +78,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -98,7 +98,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -53,7 +53,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -73,7 +73,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -55,7 +55,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -75,7 +75,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -98,7 +98,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -61,7 +61,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -81,7 +81,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -104,7 +104,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -58,7 +58,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -78,7 +78,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -48,7 +48,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -68,7 +68,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -52,7 +52,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -72,7 +72,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -48,7 +48,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -68,7 +68,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -52,7 +52,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -72,7 +72,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -47,7 +47,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -67,7 +67,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -51,7 +51,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -71,7 +71,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"
@ -44,7 +44,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"
@ -63,7 +63,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"
@ -47,7 +47,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"
@ -72,7 +72,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-12T04:13:14Z" creationTimestamp: "2016-12-12T04:13:14Z"
@ -42,7 +42,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-12T04:13:15Z" creationTimestamp: "2016-12-12T04:13:15Z"
@ -61,7 +61,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-12T04:13:15Z" creationTimestamp: "2016-12-12T04:13:15Z"
@ -86,7 +86,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-14T15:32:41Z" creationTimestamp: "2016-12-14T15:32:41Z"

View File

@ -0,0 +1,95 @@
apiVersion: kops/v1alpha2
kind: Cluster
metadata:
creationTimestamp: "2016-12-10T22:42:27Z"
name: complex.example.com
spec:
api:
loadBalancer:
type: Public
additionalSecurityGroups:
- sg-exampleid3
- sg-exampleid4
kubernetesApiAccess:
- 0.0.0.0/0
channel: stable
cloudProvider: aws
cloudLabels:
Owner: John Doe
foo/bar: fib+baz
configBase: memfs://clusters.example.com/complex.example.com
etcdClusters:
- etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: main
- etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: events
kubeAPIServer:
serviceNodePortRange: 28000-32767
kubernetesVersion: v1.4.12
masterInternalName: api.internal.complex.example.com
masterPublicName: api.complex.example.com
networkCIDR: 172.20.0.0/16
networking:
kubenet: {}
nodePortAccess:
- 1.2.3.4/32
- 10.20.30.0/24
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
topology:
masters: public
nodes: public
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
type: Public
zone: us-test-1a
---
apiVersion: kops/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2016-12-10T22:42:28Z"
name: nodes
labels:
kops.k8s.io/cluster: complex.example.com
spec:
additionalSecurityGroups:
- sg-exampleid3
- sg-exampleid4
associatePublicIp: true
suspendProcesses:
- AZRebalance
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: t2.medium
maxSize: 2
minSize: 2
role: Node
subnets:
- us-test-1a
detailedInstanceMonitoring: true
---
apiVersion: kops/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2016-12-10T22:42:28Z"
name: master-us-test-1a
labels:
kops.k8s.io/cluster: complex.example.com
spec:
associatePublicIp: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: m3.medium
maxSize: 1
minSize: 1
role: Master
subnets:
- us-test-1a

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"
@ -52,7 +52,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"
@ -77,7 +77,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -52,7 +52,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -72,7 +72,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -92,7 +92,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -112,7 +112,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"
@ -38,7 +38,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"
@ -59,7 +59,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:27Z" creationTimestamp: "2016-12-10T22:42:27Z"
@ -57,7 +57,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -76,7 +76,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -95,7 +95,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -115,7 +115,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2018-03-20T16:00:27Z" creationTimestamp: "2018-03-20T16:00:27Z"
@ -38,7 +38,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"
@ -59,7 +59,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2016-12-10T22:42:28Z" creationTimestamp: "2016-12-10T22:42:28Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -49,7 +49,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -67,7 +67,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -85,7 +85,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -103,7 +103,7 @@ spec:
--- ---
apiVersion: kops/v1alpha1 apiVersion: kops.k8s.io/v1alpha1
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -57,7 +57,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -75,7 +75,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -93,7 +93,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
@ -111,7 +111,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"

View File

@ -1,4 +1,4 @@
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -52,7 +52,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -72,7 +72,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -92,7 +92,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z
@ -112,7 +112,7 @@ spec:
--- ---
apiVersion: kops/v1alpha2 apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup kind: InstanceGroup
metadata: metadata:
creationTimestamp: 2017-01-01T00:00:00Z creationTimestamp: 2017-01-01T00:00:00Z

Some files were not shown because too many files have changed in this diff Show More