From d0382fab95f4817ff9399bbb66b8b9558e87b0b2 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sun, 11 Mar 2018 20:15:55 -0400 Subject: [PATCH 1/2] Promote alpha channel to stable --- channels/stable | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/channels/stable b/channels/stable index f3b4f3963a..8c5bbf8b66 100644 --- a/channels/stable +++ b/channels/stable @@ -4,24 +4,24 @@ spec: - name: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28 providerID: aws kubernetesVersion: ">=1.4.0 <1.5.0" - - name: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + - name: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 providerID: aws kubernetesVersion: ">=1.5.0 <1.6.0" - - name: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2018-01-14 + - name: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2018-02-08 providerID: aws kubernetesVersion: ">=1.6.0 <1.7.0" - - name: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 + - name: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-02-08 providerID: aws kubernetesVersion: ">=1.7.0 <1.8.0" - - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-14 + - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-02-08 providerID: aws kubernetesVersion: ">=1.8.0 <1.9.0" - - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-14 + - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-02-08 providerID: aws kubernetesVersion: ">=1.9.0 <1.10.0" # Need stretch as default in 1.10 (for nvme) # BUT... this is causing the submit queue to block, so back to jessie temporarily: https://github.com/kubernetes/kubernetes/issues/56763 - - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-14 + - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-02-08 providerID: aws kubernetesVersion: ">=1.10.0" - providerID: gce @@ -35,10 +35,10 @@ spec: recommendedVersion: 1.9.3 requiredVersion: 1.9.0 - range: ">=1.8.0" - recommendedVersion: 1.8.6 + recommendedVersion: 1.8.7 requiredVersion: 1.8.0 - range: ">=1.7.0" - recommendedVersion: 1.7.11 + recommendedVersion: 1.7.12 requiredVersion: 1.7.0 - range: ">=1.6.0" recommendedVersion: 1.6.13 @@ -55,22 +55,22 @@ spec: #requiredVersion: 1.9.0-alpha.1 kubernetesVersion: 1.9.3 - range: ">=1.8.0-alpha.1" - recommendedVersion: 1.8.0 - #requiredVersion: 1.8.0 - kubernetesVersion: 1.8.6 + recommendedVersion: 1.8.1 + requiredVersion: 1.7.1 + kubernetesVersion: 1.8.7 - range: ">=1.7.0-alpha.1" - recommendedVersion: 1.7.1 - #requiredVersion: 1.7.0 - kubernetesVersion: 1.7.11 + recommendedVersion: 1.8.1 + requiredVersion: 1.7.1 + kubernetesVersion: 1.7.12 - range: ">=1.6.0-alpha.1" - #recommendedVersion: 1.6.0 - #requiredVersion: 1.6.0 + recommendedVersion: 1.8.1 + requiredVersion: 1.7.1 kubernetesVersion: 1.6.13 - range: ">=1.5.0-alpha1" - recommendedVersion: 1.5.1 - #requiredVersion: 1.5.1 + recommendedVersion: 1.8.1 + requiredVersion: 1.7.1 kubernetesVersion: 1.5.8 - range: "<1.5.0" - recommendedVersion: 1.4.4 - #requiredVersion: 1.4.4 + recommendedVersion: 1.8.1 + requiredVersion: 1.7.1 kubernetesVersion: 1.4.12 From 5d36f9e37dad1fd40ebe3bac9db178e53eed6041 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 12 Mar 2018 02:17:49 -0400 Subject: [PATCH 2/2] Update kops version in tests We need to satisfy the new minimum supported version. --- cmd/kops/integration_test.go | 8 +++---- cmd/kops/lifecycle_integration_test.go | 2 +- .../complex/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/ha/expected-v1alpha1.yaml | 8 +++---- .../create_cluster/ha/expected-v1alpha2.yaml | 8 +++---- .../ha_encrypt/expected-v1alpha1.yaml | 8 +++---- .../ha_encrypt/expected-v1alpha2.yaml | 8 +++---- .../overrides/expected-v1alpha2.yaml | 4 ++-- .../cloudformation.json.extracted.yaml | 24 +++++++++---------- .../cloudformation.json.extracted.yaml | 24 +++++++++---------- upup/pkg/fi/cloudup/apply_cluster.go | 2 +- 11 files changed, 50 insertions(+), 50 deletions(-) diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go index 1795f3a6b5..6cb84b43ae 100644 --- a/cmd/kops/integration_test.go +++ b/cmd/kops/integration_test.go @@ -320,7 +320,7 @@ func runTestAWS(t *testing.T, clusterName string, srcDir string, version string, h := testutils.NewIntegrationTestHarness(t) defer h.Close() - h.MockKopsVersion("1.7.0") + h.MockKopsVersion("1.8.1") h.SetupMockAWS() expectedFilenames := []string{ @@ -358,7 +358,7 @@ func runTestPhase(t *testing.T, clusterName string, srcDir string, version strin h := testutils.NewIntegrationTestHarness(t) defer h.Close() - h.MockKopsVersion("1.7.0") + h.MockKopsVersion("1.8.1") h.SetupMockAWS() phaseName := string(phase) if phaseName == "" { @@ -406,7 +406,7 @@ func runTestGCE(t *testing.T, clusterName string, srcDir string, version string, h := testutils.NewIntegrationTestHarness(t) defer h.Close() - h.MockKopsVersion("1.7.0") + h.MockKopsVersion("1.8.1") h.SetupMockGCE() expectedFilenames := []string{ @@ -438,7 +438,7 @@ func runTestCloudformation(t *testing.T, clusterName string, srcDir string, vers h := testutils.NewIntegrationTestHarness(t) defer h.Close() - h.MockKopsVersion("1.7.0") + h.MockKopsVersion("1.8.1") h.SetupMockAWS() factory := util.NewFactory(factoryOptions) diff --git a/cmd/kops/lifecycle_integration_test.go b/cmd/kops/lifecycle_integration_test.go index 2b0a338c5a..de309a8985 100644 --- a/cmd/kops/lifecycle_integration_test.go +++ b/cmd/kops/lifecycle_integration_test.go @@ -135,7 +135,7 @@ func runLifecycleTestAWS(o *LifecycleTestOptions) { h := testutils.NewIntegrationTestHarness(o.t) defer h.Close() - h.MockKopsVersion("1.7.0") + h.MockKopsVersion("1.8.1") h.SetupMockAWS() runLifecycleTest(h, o) diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index bad1d60153..84ff48a61c 100644 --- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml @@ -54,7 +54,7 @@ metadata: kops.k8s.io/cluster: complex.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -74,7 +74,7 @@ metadata: kops.k8s.io/cluster: complex.example.com name: nodes spec: - image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: t2.medium maxSize: 2 minSize: 2 diff --git a/tests/integration/create_cluster/ha/expected-v1alpha1.yaml b/tests/integration/create_cluster/ha/expected-v1alpha1.yaml index 9775ec0526..9178f249d6 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha1.yaml @@ -62,7 +62,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -82,7 +82,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1b spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -102,7 +102,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1c spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -122,7 +122,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: t2.medium maxSize: 2 minSize: 2 diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml index 7ca80fa365..7a8d6d56c1 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -70,7 +70,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -90,7 +90,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1b spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -110,7 +110,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1c spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -130,7 +130,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: t2.medium maxSize: 2 minSize: 2 diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml index 999169f0e3..6e7275b5ae 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml @@ -68,7 +68,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -88,7 +88,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1b spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -108,7 +108,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1c spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -128,7 +128,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: t2.medium maxSize: 2 minSize: 2 diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml index ad1f3f6147..0362654337 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -76,7 +76,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -96,7 +96,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1b spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -116,7 +116,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: master-us-test-1c spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -136,7 +136,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: t2.medium maxSize: 2 minSize: 2 diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml index a5cff824e4..9ebdbd2470 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -57,7 +57,7 @@ metadata: kops.k8s.io/cluster: overrides.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: m3.medium maxSize: 1 minSize: 1 @@ -77,7 +77,7 @@ metadata: kops.k8s.io/cluster: overrides.example.com name: nodes spec: - image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-02-08 machineType: t2.medium maxSize: 2 minSize: 2 diff --git a/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml index 6307c68615..a14163d5b1 100644 --- a/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml @@ -27,8 +27,8 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda set -o nounset set -o pipefail - NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/nodeup - NODEUP_HASH=2a7b5fdd443e7c91c0af84593e2111c1a4105b79 + NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/nodeup + NODEUP_HASH=bb41724c37d15ab7e039e06230e742b9b38d0808 @@ -265,7 +265,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda - c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet - d9fdb6b37597d371ef853cde76170f38a553aa78@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubectl - 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz - - 5d95d64d7134f202ba60b1fa14adaff138905d15@https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/utils.tar.gz + - 42b15a0a0a56531750bde3c7b08d0cf27c170c48@https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/utils.tar.gz ClusterName: additionaluserdata.example.com ConfigBase: memfs://clusters.example.com/additionaluserdata.example.com InstanceGroupName: master-us-test-1a @@ -276,9 +276,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda channels: - memfs://clusters.example.com/additionaluserdata.example.com/addons/bootstrap-channel.yaml protokubeImage: - hash: 5bd97a02f0793d1906e9f446c548ececf1444737 - name: protokube:1.7.0 - source: https://kubeupv2.s3.amazonaws.com/kops/1.7.0/images/protokube.tar.gz + hash: 0b1f26208f8f6cc02468368706d0236670fec8a2 + name: protokube:1.8.1 + source: https://kubeupv2.s3.amazonaws.com/kops/1.8.1/images/protokube.tar.gz __EOF_KUBE_ENV @@ -325,8 +325,8 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro set -o nounset set -o pipefail - NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/nodeup - NODEUP_HASH=2a7b5fdd443e7c91c0af84593e2111c1a4105b79 + NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/nodeup + NODEUP_HASH=bb41724c37d15ab7e039e06230e742b9b38d0808 @@ -494,7 +494,7 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro - c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet - d9fdb6b37597d371ef853cde76170f38a553aa78@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubectl - 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz - - 5d95d64d7134f202ba60b1fa14adaff138905d15@https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/utils.tar.gz + - 42b15a0a0a56531750bde3c7b08d0cf27c170c48@https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/utils.tar.gz ClusterName: additionaluserdata.example.com ConfigBase: memfs://clusters.example.com/additionaluserdata.example.com InstanceGroupName: nodes @@ -504,9 +504,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro channels: - memfs://clusters.example.com/additionaluserdata.example.com/addons/bootstrap-channel.yaml protokubeImage: - hash: 5bd97a02f0793d1906e9f446c548ececf1444737 - name: protokube:1.7.0 - source: https://kubeupv2.s3.amazonaws.com/kops/1.7.0/images/protokube.tar.gz + hash: 0b1f26208f8f6cc02468368706d0236670fec8a2 + name: protokube:1.8.1 + source: https://kubeupv2.s3.amazonaws.com/kops/1.8.1/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml index 5858de70b9..b91cebc612 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml @@ -18,8 +18,8 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco set -o nounset set -o pipefail - NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/nodeup - NODEUP_HASH=2a7b5fdd443e7c91c0af84593e2111c1a4105b79 + NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/nodeup + NODEUP_HASH=bb41724c37d15ab7e039e06230e742b9b38d0808 @@ -256,7 +256,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco - c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet - d9fdb6b37597d371ef853cde76170f38a553aa78@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubectl - 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz - - 5d95d64d7134f202ba60b1fa14adaff138905d15@https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/utils.tar.gz + - 42b15a0a0a56531750bde3c7b08d0cf27c170c48@https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/utils.tar.gz ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -267,9 +267,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml protokubeImage: - hash: 5bd97a02f0793d1906e9f446c548ececf1444737 - name: protokube:1.7.0 - source: https://kubeupv2.s3.amazonaws.com/kops/1.7.0/images/protokube.tar.gz + hash: 0b1f26208f8f6cc02468368706d0236670fec8a2 + name: protokube:1.8.1 + source: https://kubeupv2.s3.amazonaws.com/kops/1.8.1/images/protokube.tar.gz __EOF_KUBE_ENV @@ -295,8 +295,8 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use set -o nounset set -o pipefail - NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/nodeup - NODEUP_HASH=2a7b5fdd443e7c91c0af84593e2111c1a4105b79 + NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/nodeup + NODEUP_HASH=bb41724c37d15ab7e039e06230e742b9b38d0808 @@ -464,7 +464,7 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use - c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet - d9fdb6b37597d371ef853cde76170f38a553aa78@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubectl - 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz - - 5d95d64d7134f202ba60b1fa14adaff138905d15@https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/utils.tar.gz + - 42b15a0a0a56531750bde3c7b08d0cf27c170c48@https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/utils.tar.gz ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -474,9 +474,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml protokubeImage: - hash: 5bd97a02f0793d1906e9f446c548ececf1444737 - name: protokube:1.7.0 - source: https://kubeupv2.s3.amazonaws.com/kops/1.7.0/images/protokube.tar.gz + hash: 0b1f26208f8f6cc02468368706d0236670fec8a2 + name: protokube:1.8.1 + source: https://kubeupv2.s3.amazonaws.com/kops/1.8.1/images/protokube.tar.gz __EOF_KUBE_ENV diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 58e9c25ec0..ff6ad615d7 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -826,7 +826,7 @@ func (c *ApplyClusterCmd) validateKopsVersion() error { fmt.Printf("A new kops version is available: %s\n", recommended) } fmt.Printf("\n") - fmt.Printf("This version of kops is no longer supported; upgrading is required\n") + fmt.Printf("This version of kops (%s) is no longer supported; upgrading is required\n", kopsbase.Version) fmt.Printf("(you can bypass this check by exporting KOPS_RUN_OBSOLETE_VERSION)\n") fmt.Printf("\n") fmt.Printf("More information: %s\n", buildPermalink("upgrade_kops", recommended.String()))