diff --git a/cmd/kops/create_cluster_integration_test.go b/cmd/kops/create_cluster_integration_test.go index 9a5a638f56..21a92e04d9 100644 --- a/cmd/kops/create_cluster_integration_test.go +++ b/cmd/kops/create_cluster_integration_test.go @@ -216,7 +216,7 @@ func runCreateClusterIntegrationTest(t *testing.T, srcDir string, version string for _, cluster := range clusters.Items { 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 { 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 { 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 { t.Fatalf("unexpected error serializing InstanceGroup: %v", err) } diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go index 45df4a638a..dc622f2477 100644 --- a/cmd/kops/integration_test.go +++ b/cmd/kops/integration_test.go @@ -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 func TestComplex(t *testing.T) { 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 diff --git a/docs/apireference/build/documents/_generated_cluster_v1alpha2_kops_concept.md b/docs/apireference/build/documents/_generated_cluster_v1alpha2_kops_concept.md index 3b7f94c8f6..28512f22aa 100644 --- a/docs/apireference/build/documents/_generated_cluster_v1alpha2_kops_concept.md +++ b/docs/apireference/build/documents/_generated_cluster_v1alpha2_kops_concept.md @@ -7,7 +7,7 @@ ```bdocs-tab:example_yaml -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2019-12-10T22:42:27Z" diff --git a/docs/apireference/build/documents/_generated_instancegroup_v1alpha2_kops_concept.md b/docs/apireference/build/documents/_generated_instancegroup_v1alpha2_kops_concept.md index 5777a5671a..427eb95f35 100644 --- a/docs/apireference/build/documents/_generated_instancegroup_v1alpha2_kops_concept.md +++ b/docs/apireference/build/documents/_generated_instancegroup_v1alpha2_kops_concept.md @@ -7,7 +7,7 @@ ```bdocs-tab:example_yaml -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: null diff --git a/docs/apireference/examples/cluster/cluster.yaml b/docs/apireference/examples/cluster/cluster.yaml index bbebd8525c..5407bd9098 100644 --- a/docs/apireference/examples/cluster/cluster.yaml +++ b/docs/apireference/examples/cluster/cluster.yaml @@ -1,5 +1,5 @@ sample: | - apiVersion: kops/v1alpha2 + apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2019-12-10T22:42:27Z" diff --git a/docs/apireference/examples/instancegroup/instancegroup.yaml b/docs/apireference/examples/instancegroup/instancegroup.yaml index 6bdedf65f3..f763ce2298 100644 --- a/docs/apireference/examples/instancegroup/instancegroup.yaml +++ b/docs/apireference/examples/instancegroup/instancegroup.yaml @@ -1,5 +1,5 @@ sample: | - apiVersion: kops/v1alpha2 + apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: null diff --git a/docs/authentication.md b/docs/authentication.md index 0629ae76cc..e18147d1e0 100644 --- a/docs/authentication.md +++ b/docs/authentication.md @@ -20,7 +20,7 @@ authentication: For example: ``` -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: name: cluster.example.com @@ -48,7 +48,7 @@ authentication: For example: ``` -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: name: cluster.example.com diff --git a/docs/bastion.md b/docs/bastion.md index 9533010aae..46078010eb 100644 --- a/docs/bastion.md +++ b/docs/bastion.md @@ -31,7 +31,7 @@ kops edit ig bastions --name $KOPS_NAME You should now be able to edit and configure your bastion instance group. ```yaml -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2017-01-05T13:37:07Z" diff --git a/docs/cluster_template.md b/docs/cluster_template.md index fecb878b97..e1cf231fc6 100644 --- a/docs/cluster_template.md +++ b/docs/cluster_template.md @@ -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: ```yaml # File cluster.tmpl.yaml -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: 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'. ```YAML -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: name: {{ .environment }}.{{ .dns_zone }} diff --git a/docs/examples/kops-test-route53-subdomain.md b/docs/examples/kops-test-route53-subdomain.md index c2e14f639b..3544254c34 100644 --- a/docs/examples/kops-test-route53-subdomain.md +++ b/docs/examples/kops-test-route53-subdomain.md @@ -686,7 +686,7 @@ kops edit ig nodes 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 metadata: creationTimestamp: 2017-09-06T13:40:39Z @@ -708,7 +708,7 @@ spec: Let's change minSize and maxSize to "3" ``` -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-09-06T13:40:39Z diff --git a/docs/examples/kops-tests-private-net-bastion-host.md b/docs/examples/kops-tests-private-net-bastion-host.md index 873e9ccd00..b00862bbde 100644 --- a/docs/examples/kops-tests-private-net-bastion-host.md +++ b/docs/examples/kops-tests-private-net-bastion-host.md @@ -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. ```bash -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: null @@ -320,7 +320,7 @@ kops edit ig bastions --name ${NAME} And change minSize/maxSize to 3 (3 instances) and add more subnets: ```bash -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-08-28T17:05:23Z diff --git a/docs/instance_groups.md b/docs/instance_groups.md index aeb2db2f6e..503d3e9fd1 100644 --- a/docs/instance_groups.md +++ b/docs/instance_groups.md @@ -431,7 +431,7 @@ If you need to add tags on auto scaling groups or instances (propagate ASG tags) ``` # Example for nodes -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: labels: @@ -459,7 +459,7 @@ will rescale the ASG without warning. ``` # Example for nodes -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: labels: @@ -489,7 +489,7 @@ load balancers and Network load balancers. ``` # Example ingress nodes -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: labels: @@ -513,7 +513,7 @@ Detailed-Monitoring will cause the monitoring data to be available every 1 minut ``` # Example for nodes -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: labels: diff --git a/docs/manifests_and_customizing_via_api.md b/docs/manifests_and_customizing_via_api.md index e3f5d3fa1d..2fe6ad64c3 100644 --- a/docs/manifests_and_customizing_via_api.md +++ b/docs/manifests_and_customizing_via_api.md @@ -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. ```yaml -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-05-04T23:21:47Z @@ -134,7 +134,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-05-04T23:21:48Z @@ -155,7 +155,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-05-04T23:21:47Z @@ -174,7 +174,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-05-04T23:21:47Z @@ -193,7 +193,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-05-04T23:21:48Z @@ -212,7 +212,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: 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. ```yaml -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-05-04T23:21:48Z @@ -289,7 +289,7 @@ Please refer to the rolling-update [documentation](cli/kops_rolling-update_clust ### Cluster Spec ```yaml -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: 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 ```yaml -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-05-04T23:21:48Z diff --git a/docs/secrets.md b/docs/secrets.md index ec33272b29..45a79a5a2b 100644 --- a/docs/secrets.md +++ b/docs/secrets.md @@ -28,7 +28,7 @@ Note: it is currently not possible to delete secrets from the keystore that have ### adding ssh credential from spec file ```bash -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: SSHCredential metadata: labels: diff --git a/docs/security_groups.md b/docs/security_groups.md index 9e6323d9f1..6476b98928 100644 --- a/docs/security_groups.md +++ b/docs/security_groups.md @@ -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 Example: ```yaml -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -28,7 +28,7 @@ spec: . . -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" diff --git a/docs/tutorial/gce.md b/docs/tutorial/gce.md index 8995fc5d22..2ebc648788 100644 --- a/docs/tutorial/gce.md +++ b/docs/tutorial/gce.md @@ -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` ``` -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-10-03T05:07:27Z diff --git a/docs/tutorial/upgrading-kubernetes.md b/docs/tutorial/upgrading-kubernetes.md index b3beaffd8d..18c0c0d623 100644 --- a/docs/tutorial/upgrading-kubernetes.md +++ b/docs/tutorial/upgrading-kubernetes.md @@ -18,7 +18,7 @@ controlled at the cluster level. So instead of `kops edit ig `, we `kops # and an empty file will abort the edit. If an error occurs while saving this file will be # reopened with the relevant failures. # -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-10-04T03:52:25Z diff --git a/docs/tutorial/working-with-instancegroups.md b/docs/tutorial/working-with-instancegroups.md index 4f4d31d582..e9c8cefe5d 100644 --- a/docs/tutorial/working-with-instancegroups.md +++ b/docs/tutorial/working-with-instancegroups.md @@ -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: ``` -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-10-03T15:17:31Z diff --git a/nodeup/pkg/model/tests/dockerbuilder/docker_1.12.1/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_1.12.1/cluster.yaml index 39d3c3c02a..f59c460b1e 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_1.12.1/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_1.12.1/cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -36,4 +36,4 @@ spec: type: Public zone: us-test-1a docker: - version: 1.12.1 \ No newline at end of file + version: 1.12.1 diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml index d19145cf38..fc6f5090f4 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" diff --git a/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml index 33674de3c2..9e3d203021 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" diff --git a/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml b/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml index 6c3b281b42..df3de5b53e 100644 --- a/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml +++ b/nodeup/pkg/model/tests/kubelet/featuregates/cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -43,7 +43,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/pkg/apis/kops/doc.go b/pkg/apis/kops/doc.go index 936ef3b882..83a49bf21f 100644 --- a/pkg/apis/kops/doc.go +++ b/pkg/apis/kops/doc.go @@ -16,5 +16,5 @@ limitations under the License. // +k8s:deepcopy-gen=package,register -// +groupName=kops +// +groupName=kops.k8s.io package kops // import "k8s.io/kops/pkg/apis/kops" diff --git a/pkg/apis/kops/register.go b/pkg/apis/kops/register.go index cd87697c9a..7e928557e8 100644 --- a/pkg/apis/kops/register.go +++ b/pkg/apis/kops/register.go @@ -38,7 +38,7 @@ var ( //var ParameterCodec = runtime.NewParameterCodec(Scheme) // 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 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} diff --git a/pkg/apis/kops/v1alpha1/doc.go b/pkg/apis/kops/v1alpha1/doc.go index 706a61d607..8ada2a70d2 100644 --- a/pkg/apis/kops/v1alpha1/doc.go +++ b/pkg/apis/kops/v1alpha1/doc.go @@ -19,5 +19,5 @@ limitations under the License. // +k8s:deepcopy-gen=package,register // +k8s:defaulter-gen=TypeMeta -// +groupName=kops +// +groupName=kops.k8s.io package v1alpha1 diff --git a/pkg/apis/kops/v1alpha1/register.go b/pkg/apis/kops/v1alpha1/register.go index 7c624b3ff3..f1001afe56 100644 --- a/pkg/apis/kops/v1alpha1/register.go +++ b/pkg/apis/kops/v1alpha1/register.go @@ -36,7 +36,7 @@ func init() { } // 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 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/pkg/apis/kops/v1alpha2/doc.go b/pkg/apis/kops/v1alpha2/doc.go index b2229066fb..27071d1ac7 100644 --- a/pkg/apis/kops/v1alpha2/doc.go +++ b/pkg/apis/kops/v1alpha2/doc.go @@ -19,5 +19,5 @@ limitations under the License. // +k8s:deepcopy-gen=package,register // +k8s:defaulter-gen=TypeMeta -// +groupName=kops +// +groupName=kops.k8s.io package v1alpha2 // import "k8s.io/kops/pkg/apis/kops/v1alpha2" diff --git a/pkg/apis/kops/v1alpha2/register.go b/pkg/apis/kops/v1alpha2/register.go index b1f86ca3a0..68500cc1c2 100644 --- a/pkg/apis/kops/v1alpha2/register.go +++ b/pkg/apis/kops/v1alpha2/register.go @@ -36,7 +36,7 @@ func init() { } // 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 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"} diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_cluster.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_cluster.go index f0b56154cc..a058626597 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_cluster.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_cluster.go @@ -34,9 +34,9 @@ type FakeClusters struct { 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. func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *kops.Cluster, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_instancegroup.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_instancegroup.go index 4b0314421b..ac4f569d98 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_instancegroup.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_instancegroup.go @@ -34,9 +34,9 @@ type FakeInstanceGroups struct { 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. func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *kops.InstanceGroup, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_keyset.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_keyset.go index 9cb92dcdb0..8e2d41d91a 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_keyset.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_keyset.go @@ -34,9 +34,9 @@ type FakeKeysets struct { 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. func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *kops.Keyset, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_sshcredential.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_sshcredential.go index 291910f612..4bf70943e6 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_sshcredential.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/fake/fake_sshcredential.go @@ -34,9 +34,9 @@ type FakeSSHCredentials struct { 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. func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *kops.SSHCredential, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/kops_client.go b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/kops_client.go index 0d7dd465f2..207737d796 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/internalversion/kops_client.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/internalversion/kops_client.go @@ -31,7 +31,7 @@ type KopsInterface interface { 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 { restClient rest.Interface } @@ -85,8 +85,8 @@ func setConfigDefaults(config *rest.Config) error { if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - if config.GroupVersion == nil || config.GroupVersion.Group != scheme.Scheme.PrioritizedVersionsForGroup("kops")[0].Group { - gv := scheme.Scheme.PrioritizedVersionsForGroup("kops")[0] + if config.GroupVersion == nil || config.GroupVersion.Group != scheme.Scheme.PrioritizedVersionsForGroup("kops.k8s.io")[0].Group { + gv := scheme.Scheme.PrioritizedVersionsForGroup("kops.k8s.io")[0] config.GroupVersion = &gv } config.NegotiatedSerializer = scheme.Codecs diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_cluster.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_cluster.go index 3c0fd17a8f..ca0870bbab 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_cluster.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_cluster.go @@ -34,9 +34,9 @@ type FakeClusters struct { 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. func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha1.Cluster, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_instancegroup.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_instancegroup.go index 67fccf1edb..4f4097cf25 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_instancegroup.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_instancegroup.go @@ -34,9 +34,9 @@ type FakeInstanceGroups struct { 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. func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha1.InstanceGroup, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_sshcredential.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_sshcredential.go index ce1c678dbd..d39bfa56f1 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_sshcredential.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/fake/fake_sshcredential.go @@ -34,9 +34,9 @@ type FakeSSHCredentials struct { 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. func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha1.SSHCredential, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/kops_client.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/kops_client.go index 2cf72b4fce..9c13049d9a 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/kops_client.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha1/kops_client.go @@ -32,7 +32,7 @@ type KopsV1alpha1Interface interface { 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 { restClient rest.Interface } diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_cluster.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_cluster.go index e9c22166ec..1d5b333620 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_cluster.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_cluster.go @@ -34,9 +34,9 @@ type FakeClusters struct { 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. func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha2.Cluster, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_instancegroup.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_instancegroup.go index aa3e348ca5..ce23fb3454 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_instancegroup.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_instancegroup.go @@ -34,9 +34,9 @@ type FakeInstanceGroups struct { 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. func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha2.InstanceGroup, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_keyset.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_keyset.go index 99848306e9..c4fde573c1 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_keyset.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_keyset.go @@ -34,9 +34,9 @@ type FakeKeysets struct { 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. func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *v1alpha2.Keyset, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_sshcredential.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_sshcredential.go index ec97ab7b70..1c89d997c0 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_sshcredential.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/fake/fake_sshcredential.go @@ -34,9 +34,9 @@ type FakeSSHCredentials struct { 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. func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha2.SSHCredential, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/kops_client.go b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/kops_client.go index a62b6a5a0a..ccf5eaec9c 100644 --- a/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/kops_client.go +++ b/pkg/client/clientset_generated/clientset/typed/kops/v1alpha2/kops_client.go @@ -33,7 +33,7 @@ type KopsV1alpha2Interface interface { 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 { restClient rest.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_cluster.go b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_cluster.go index f0b56154cc..a058626597 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_cluster.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_cluster.go @@ -34,9 +34,9 @@ type FakeClusters struct { 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. func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *kops.Cluster, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_instancegroup.go b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_instancegroup.go index 4b0314421b..ac4f569d98 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_instancegroup.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_instancegroup.go @@ -34,9 +34,9 @@ type FakeInstanceGroups struct { 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. func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *kops.InstanceGroup, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_keyset.go b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_keyset.go index 9cb92dcdb0..8e2d41d91a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_keyset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_keyset.go @@ -34,9 +34,9 @@ type FakeKeysets struct { 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. func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *kops.Keyset, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_sshcredential.go b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_sshcredential.go index 291910f612..4bf70943e6 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_sshcredential.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/fake/fake_sshcredential.go @@ -34,9 +34,9 @@ type FakeSSHCredentials struct { 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. func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *kops.SSHCredential, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/kops_client.go b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/kops_client.go index c7afe0f2c0..a792440a13 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/kops_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/internalversion/kops_client.go @@ -31,7 +31,7 @@ type KopsInterface interface { 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 { restClient rest.Interface } @@ -85,8 +85,8 @@ func setConfigDefaults(config *rest.Config) error { if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - if config.GroupVersion == nil || config.GroupVersion.Group != scheme.Scheme.PrioritizedVersionsForGroup("kops")[0].Group { - gv := scheme.Scheme.PrioritizedVersionsForGroup("kops")[0] + if config.GroupVersion == nil || config.GroupVersion.Group != scheme.Scheme.PrioritizedVersionsForGroup("kops.k8s.io")[0].Group { + gv := scheme.Scheme.PrioritizedVersionsForGroup("kops.k8s.io")[0] config.GroupVersion = &gv } config.NegotiatedSerializer = scheme.Codecs diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_cluster.go b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_cluster.go index 3c0fd17a8f..ca0870bbab 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_cluster.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_cluster.go @@ -34,9 +34,9 @@ type FakeClusters struct { 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. func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha1.Cluster, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_instancegroup.go b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_instancegroup.go index 67fccf1edb..4f4097cf25 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_instancegroup.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_instancegroup.go @@ -34,9 +34,9 @@ type FakeInstanceGroups struct { 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. func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha1.InstanceGroup, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_sshcredential.go b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_sshcredential.go index ce1c678dbd..d39bfa56f1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_sshcredential.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/fake/fake_sshcredential.go @@ -34,9 +34,9 @@ type FakeSSHCredentials struct { 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. func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha1.SSHCredential, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/kops_client.go b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/kops_client.go index 6d59b63ffa..600d18c6a6 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/kops_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha1/kops_client.go @@ -32,7 +32,7 @@ type KopsV1alpha1Interface interface { 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 { restClient rest.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_cluster.go b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_cluster.go index e9c22166ec..1d5b333620 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_cluster.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_cluster.go @@ -34,9 +34,9 @@ type FakeClusters struct { 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. func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha2.Cluster, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_instancegroup.go b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_instancegroup.go index aa3e348ca5..ce23fb3454 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_instancegroup.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_instancegroup.go @@ -34,9 +34,9 @@ type FakeInstanceGroups struct { 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. func (c *FakeInstanceGroups) Get(name string, options v1.GetOptions) (result *v1alpha2.InstanceGroup, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_keyset.go b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_keyset.go index 99848306e9..c4fde573c1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_keyset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_keyset.go @@ -34,9 +34,9 @@ type FakeKeysets struct { 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. func (c *FakeKeysets) Get(name string, options v1.GetOptions) (result *v1alpha2.Keyset, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_sshcredential.go b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_sshcredential.go index ec97ab7b70..1c89d997c0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_sshcredential.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/fake/fake_sshcredential.go @@ -34,9 +34,9 @@ type FakeSSHCredentials struct { 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. func (c *FakeSSHCredentials) Get(name string, options v1.GetOptions) (result *v1alpha2.SSHCredential, err error) { diff --git a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/kops_client.go b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/kops_client.go index e57f2f5fce..998a2e9050 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/kops_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/kops/v1alpha2/kops_client.go @@ -33,7 +33,7 @@ type KopsV1alpha2Interface interface { 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 { restClient rest.Interface } diff --git a/pkg/kopscodecs/codecs.go b/pkg/kopscodecs/codecs.go index e52a580ec2..46a30ec33b 100644 --- a/pkg/kopscodecs/codecs.go +++ b/pkg/kopscodecs/codecs.go @@ -19,6 +19,7 @@ package kopscodecs import ( "bytes" "fmt" + "regexp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "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 func Decode(data []byte, defaultReadVersion *schema.GroupVersionKind) (runtime.Object, *schema.GroupVersionKind, error) { + data = rewriteAPIGroup(data) + decoder := decoder() object, gvk, err := decoder.Decode(data, defaultReadVersion, nil) 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 +} diff --git a/pkg/kopscodecs/codecs_test.go b/pkg/kopscodecs/codecs_test.go index 495fa0e686..d16643d7b6 100644 --- a/pkg/kopscodecs/codecs_test.go +++ b/pkg/kopscodecs/codecs_test.go @@ -47,7 +47,7 @@ func TestToVersionedYaml(t *testing.T) { }, }, expected: heredoc.Doc(` - apiVersion: kops/v1alpha2 + apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml b/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml index b38ba80cbd..10b65d6f81 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -48,7 +48,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -67,7 +67,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/codecs/componentconfig_test.go b/tests/codecs/componentconfig_test.go index 70298dd6a3..c5a0d1ef6e 100644 --- a/tests/codecs/componentconfig_test.go +++ b/tests/codecs/componentconfig_test.go @@ -34,7 +34,7 @@ func TestSerializeEmptyCluster(t *testing.T) { } yamlString := string(yaml) - expected := `apiVersion: kops/v1alpha2 + expected := `apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: null diff --git a/tests/integration/conversion/integration_test.go b/tests/integration/conversion/integration_test.go index e5bd4242fc..4985ee387a 100644 --- a/tests/integration/conversion/integration_test.go +++ b/tests/integration/conversion/integration_test.go @@ -38,6 +38,12 @@ func TestConversionMinimal(t *testing.T) { runTest(t, "minimal", "v1alpha0", "v1alpha1") 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) { @@ -82,7 +88,7 @@ func runTest(t *testing.T, srcDir string, fromVersion string, toVersion string) t.Fatalf("error parsing file %q: %v", sourcePath, err) } - expectVersion := fromVersion + expectVersion := strings.TrimPrefix(fromVersion, "legacy-") if expectVersion == "v1alpha0" { // Our version before we had v1alpha1 expectVersion = "v1alpha1" diff --git a/tests/integration/conversion/minimal/legacy-v1alpha1.yaml b/tests/integration/conversion/minimal/legacy-v1alpha1.yaml new file mode 100644 index 0000000000..2338bc2729 --- /dev/null +++ b/tests/integration/conversion/minimal/legacy-v1alpha1.yaml @@ -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 + + diff --git a/tests/integration/conversion/minimal/legacy-v1alpha2.yaml b/tests/integration/conversion/minimal/legacy-v1alpha2.yaml new file mode 100644 index 0000000000..8b9d22a762 --- /dev/null +++ b/tests/integration/conversion/minimal/legacy-v1alpha2.yaml @@ -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 diff --git a/tests/integration/conversion/minimal/v1alpha1.yaml b/tests/integration/conversion/minimal/v1alpha1.yaml index 6c386ca647..d9a20cb217 100644 --- a/tests/integration/conversion/minimal/v1alpha1.yaml +++ b/tests/integration/conversion/minimal/v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2016-12-10T22:42:27Z @@ -50,7 +50,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2016-12-10T22:42:28Z @@ -69,7 +69,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2016-12-10T22:42:28Z diff --git a/tests/integration/conversion/minimal/v1alpha2.yaml b/tests/integration/conversion/minimal/v1alpha2.yaml index 53cd411262..628898116a 100644 --- a/tests/integration/conversion/minimal/v1alpha2.yaml +++ b/tests/integration/conversion/minimal/v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2016-12-10T22:42:27Z @@ -54,7 +54,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2016-12-10T22:42:28Z @@ -73,7 +73,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2016-12-10T22:42:28Z diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index fa9cbfc6ee..370f0247cd 100644 --- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -50,7 +50,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -70,7 +70,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ha/expected-v1alpha1.yaml b/tests/integration/create_cluster/ha/expected-v1alpha1.yaml index 50714e0ea4..7a1afd435d 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -58,7 +58,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -78,7 +78,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -98,7 +98,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -118,7 +118,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml index 21e6101389..4d878c5abd 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -66,7 +66,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -86,7 +86,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -106,7 +106,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -126,7 +126,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml index 8edc031191..b5490d7981 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -64,7 +64,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -84,7 +84,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -104,7 +104,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -124,7 +124,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index c29c18606f..de9ce5b361 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -72,7 +72,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -92,7 +92,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -112,7 +112,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -132,7 +132,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml index ca6b0f5884..5124385cdd 100644 --- a/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -57,7 +57,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -79,7 +79,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -101,7 +101,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -123,7 +123,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml index 68d84aeffd..38fb761f44 100644 --- a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -70,7 +70,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -90,7 +90,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -110,7 +110,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -130,7 +130,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -150,7 +150,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -170,7 +170,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ingwspecified/expected-v1alpha1.yaml b/tests/integration/create_cluster/ingwspecified/expected-v1alpha1.yaml index 9d40a73230..63e146360d 100644 --- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -52,7 +52,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -72,7 +72,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -92,7 +92,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml index d772aef4d1..fd9867a7fe 100644 --- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -58,7 +58,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -78,7 +78,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -98,7 +98,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml b/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml index e866500d9f..7e395fe999 100644 --- a/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -48,7 +48,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -68,7 +68,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml index 26b473461e..f3827b354b 100644 --- a/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -52,7 +52,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -72,7 +72,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha1.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha1.yaml index 5455f643e6..27c59bcacd 100644 --- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -52,7 +52,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -72,7 +72,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -92,7 +92,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml index 4040271265..7ad5b364fe 100644 --- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -58,7 +58,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -78,7 +78,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -98,7 +98,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml index 88bc048ee1..611f0a4140 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -53,7 +53,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -73,7 +73,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/private/expected-v1alpha1.yaml b/tests/integration/create_cluster/private/expected-v1alpha1.yaml index d7970bd058..2a52b58b2d 100644 --- a/tests/integration/create_cluster/private/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/private/expected-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -55,7 +55,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -75,7 +75,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -98,7 +98,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/private/expected-v1alpha2.yaml b/tests/integration/create_cluster/private/expected-v1alpha2.yaml index 9b7afe127d..a84bc9e18f 100644 --- a/tests/integration/create_cluster/private/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -61,7 +61,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -81,7 +81,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -104,7 +104,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml index 630480e182..8d6f1c8903 100644 --- a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -58,7 +58,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -78,7 +78,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/shared_subnets/expected-v1alpha1.yaml b/tests/integration/create_cluster/shared_subnets/expected-v1alpha1.yaml index e8b108a547..f5e30be1c5 100644 --- a/tests/integration/create_cluster/shared_subnets/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/shared_subnets/expected-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -48,7 +48,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -68,7 +68,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml index ede2ca7ec0..457c6b896c 100644 --- a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -52,7 +52,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -72,7 +72,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha1.yaml b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha1.yaml index e8b108a547..f5e30be1c5 100644 --- a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -48,7 +48,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -68,7 +68,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml index ede2ca7ec0..457c6b896c 100644 --- a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -52,7 +52,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -72,7 +72,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha1.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha1.yaml index 1192b0e8e2..5358d2a7ea 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -47,7 +47,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -67,7 +67,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml index 303b568588..77e1cc40e9 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -51,7 +51,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -71,7 +71,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/update_cluster/additional_cidr/in-v1alpha2.yaml b/tests/integration/update_cluster/additional_cidr/in-v1alpha2.yaml index 523dacf91e..d34511a28c 100644 --- a/tests/integration/update_cluster/additional_cidr/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/additional_cidr/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -44,7 +44,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -63,7 +63,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/additional_user-data/in-v1alpha2.yaml b/tests/integration/update_cluster/additional_user-data/in-v1alpha2.yaml index a9d5a59170..0974d98e49 100644 --- a/tests/integration/update_cluster/additional_user-data/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/additional_user-data/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -47,7 +47,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -72,7 +72,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/bastionadditional_user-data/in-v1alpha2.yaml b/tests/integration/update_cluster/bastionadditional_user-data/in-v1alpha2.yaml index b1a9d349e1..a5575a31a1 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/bastionadditional_user-data/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -42,7 +42,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -61,7 +61,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -86,7 +86,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml new file mode 100644 index 0000000000..1d84bfe6b7 --- /dev/null +++ b/tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml @@ -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 diff --git a/tests/integration/update_cluster/complex/in-v1alpha2.yaml b/tests/integration/update_cluster/complex/in-v1alpha2.yaml index 1d84bfe6b7..bd507e241c 100644 --- a/tests/integration/update_cluster/complex/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/complex/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -52,7 +52,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -77,7 +77,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/existing_iam/in-v1alpha2.yaml b/tests/integration/update_cluster/existing_iam/in-v1alpha2.yaml index a6c1097db0..f29173c2a5 100644 --- a/tests/integration/update_cluster/existing_iam/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/existing_iam/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -52,7 +52,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -72,7 +72,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -92,7 +92,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -112,7 +112,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/in-v1alpha2.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/in-v1alpha2.yaml index 136a32a239..d37b8291e2 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -38,7 +38,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -59,7 +59,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml b/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml index e670497777..61af551f04 100644 --- a/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/existing_sg/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -57,7 +57,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -76,7 +76,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -95,7 +95,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -115,7 +115,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/externallb/in-v1alpha2.yaml b/tests/integration/update_cluster/externallb/in-v1alpha2.yaml index 51c0d6db9e..a1d1667cdb 100644 --- a/tests/integration/update_cluster/externallb/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/externallb/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2018-03-20T16:00:27Z" @@ -38,7 +38,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -59,7 +59,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/ha/in-v1alpha1.yaml b/tests/integration/update_cluster/ha/in-v1alpha1.yaml index 45663acbe5..dafa3d0747 100644 --- a/tests/integration/update_cluster/ha/in-v1alpha1.yaml +++ b/tests/integration/update_cluster/ha/in-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -49,7 +49,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -67,7 +67,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -85,7 +85,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -103,7 +103,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" diff --git a/tests/integration/update_cluster/ha/in-v1alpha2.yaml b/tests/integration/update_cluster/ha/in-v1alpha2.yaml index 2571688b9a..71a5e27d12 100644 --- a/tests/integration/update_cluster/ha/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/ha/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -57,7 +57,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -75,7 +75,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -93,7 +93,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" @@ -111,7 +111,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2017-01-01T00:00:00Z" diff --git a/tests/integration/update_cluster/ha_gce/in-v1alpha2.yaml b/tests/integration/update_cluster/ha_gce/in-v1alpha2.yaml index f558e74efc..7ddd727e7b 100644 --- a/tests/integration/update_cluster/ha_gce/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/ha_gce/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -52,7 +52,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -72,7 +72,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -92,7 +92,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z @@ -112,7 +112,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: 2017-01-01T00:00:00Z diff --git a/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml b/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml index 3b9e28c4c4..1dfbf5cff7 100644 --- a/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/lifecycle_phases/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -42,7 +42,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -61,7 +61,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -81,7 +81,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/minimal-cloudformation/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal-cloudformation/in-v1alpha2.yaml index 66df656963..ea13cb0801 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal-cloudformation/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -38,7 +38,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -57,7 +57,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/minimal/in-v1alpha1.yaml b/tests/integration/update_cluster/minimal/in-v1alpha1.yaml index 09e5336d78..80844fd2cb 100644 --- a/tests/integration/update_cluster/minimal/in-v1alpha1.yaml +++ b/tests/integration/update_cluster/minimal/in-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -37,7 +37,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -56,7 +56,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/minimal/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal/in-v1alpha2.yaml index be78a17311..6cc46af3af 100644 --- a/tests/integration/update_cluster/minimal/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -38,7 +38,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -57,7 +57,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml b/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml index 70e0057263..074870dcdd 100644 --- a/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/private-shared-subnet/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -46,7 +46,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -65,7 +65,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -85,7 +85,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privatecalico/in-v1alpha1.yaml b/tests/integration/update_cluster/privatecalico/in-v1alpha1.yaml index 8644d455e9..d0421da5e0 100644 --- a/tests/integration/update_cluster/privatecalico/in-v1alpha1.yaml +++ b/tests/integration/update_cluster/privatecalico/in-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -39,7 +39,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -58,7 +58,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -78,7 +78,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml index 8f6386b830..4d3ff7a60a 100644 --- a/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecalico/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -42,7 +42,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -61,7 +61,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -81,7 +81,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privatecanal/in-v1alpha1.yaml b/tests/integration/update_cluster/privatecanal/in-v1alpha1.yaml index ddb22d4b44..8d711b4937 100644 --- a/tests/integration/update_cluster/privatecanal/in-v1alpha1.yaml +++ b/tests/integration/update_cluster/privatecanal/in-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -39,7 +39,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -58,7 +58,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -78,7 +78,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml index 6574bcd57e..8cbbac2d1a 100644 --- a/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecanal/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -42,7 +42,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -61,7 +61,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -81,7 +81,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml b/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml index 56af88092f..77339e7eda 100644 --- a/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatedns1/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -45,7 +45,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -64,7 +64,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -84,7 +84,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml b/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml index 7e9dcda850..fac5325aec 100644 --- a/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatedns2/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -46,7 +46,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -65,7 +65,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -85,7 +85,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privateflannel/in-v1alpha1.yaml b/tests/integration/update_cluster/privateflannel/in-v1alpha1.yaml index 0d5bebb8a1..4c9ca99fd4 100644 --- a/tests/integration/update_cluster/privateflannel/in-v1alpha1.yaml +++ b/tests/integration/update_cluster/privateflannel/in-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -40,7 +40,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -59,7 +59,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -79,7 +79,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml b/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml index 1f88d2cc88..f21d2e2692 100644 --- a/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privateflannel/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -43,7 +43,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -62,7 +62,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -82,7 +82,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml b/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml index 7fbe98ea30..fb5bba013d 100644 --- a/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatekopeio/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -52,7 +52,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -71,7 +71,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -92,7 +92,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privateweave/in-v1alpha1.yaml b/tests/integration/update_cluster/privateweave/in-v1alpha1.yaml index 89fe30fbdf..abd4c8afeb 100644 --- a/tests/integration/update_cluster/privateweave/in-v1alpha1.yaml +++ b/tests/integration/update_cluster/privateweave/in-v1alpha1.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -39,7 +39,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -58,7 +58,7 @@ spec: --- -apiVersion: kops/v1alpha1 +apiVersion: kops.k8s.io/v1alpha1 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -78,7 +78,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/privateweave/in-v1alpha2.yaml b/tests/integration/update_cluster/privateweave/in-v1alpha2.yaml index c5af0d9219..4df7937f8d 100644 --- a/tests/integration/update_cluster/privateweave/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privateweave/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-12T04:13:14Z" @@ -42,7 +42,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -61,7 +61,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-12T04:13:15Z" @@ -81,7 +81,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-14T15:32:41Z" diff --git a/tests/integration/update_cluster/restrict_access/in-v1alpha2.yaml b/tests/integration/update_cluster/restrict_access/in-v1alpha2.yaml index 490bc20915..739840d065 100644 --- a/tests/integration/update_cluster/restrict_access/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/restrict_access/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -40,7 +40,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -59,7 +59,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml b/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml index e477883ed2..bc985fbdca 100644 --- a/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/shared_subnet/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -40,7 +40,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -59,7 +59,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml b/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml index 62baca0907..5c48cf8f5e 100644 --- a/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/shared_vpc/in-v1alpha2.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" @@ -39,7 +39,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" @@ -58,7 +58,7 @@ spec: --- -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: creationTimestamp: "2016-12-10T22:42:28Z" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml index b2f67cd37a..8708c627cb 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/cluster.yaml index 1b6e6260b1..711012ae0f 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml index 80fb223aa6..5a339f3999 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml index cda226298b..024bca94b3 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Cluster metadata: creationTimestamp: "2016-12-10T22:42:27Z" diff --git a/upup/pkg/fi/vfs_castore_test.go b/upup/pkg/fi/vfs_castore_test.go index 216d03fcc8..c227eed06e 100644 --- a/upup/pkg/fi/vfs_castore_test.go +++ b/upup/pkg/fi/vfs_castore_test.go @@ -107,7 +107,7 @@ func TestVFSCAStoreRoundTrip(t *testing.T) { } expected := ` -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Keyset metadata: creationTimestamp: null @@ -166,7 +166,7 @@ spec: } expected := ` -apiVersion: kops/v1alpha2 +apiVersion: kops.k8s.io/v1alpha2 kind: Keyset metadata: creationTimestamp: null