kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4656 from justinsb/bump_alpha_to_stable_201803 

Promote alpha channel to stable
This commit is contained in:
k8s-ci-robot 2018-03-12 07:27:20 -07:00 committed by GitHub
parent f7a6799b28 5d36f9e37d
commit 5eb1fc4985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
channels/stable
View File

@ -4,24 +4,24 @@ spec:
- name: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28 - name: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
providerID: aws providerID: aws
kubernetesVersion: ">=1.4.0 <1.5.0" 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 providerID: aws
kubernetesVersion: ">=1.5.0 <1.6.0" 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 providerID: aws
kubernetesVersion: ">=1.6.0 <1.7.0" 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 providerID: aws
kubernetesVersion: ">=1.7.0 <1.8.0" 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 providerID: aws
kubernetesVersion: ">=1.8.0 <1.9.0" 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 providerID: aws
kubernetesVersion: ">=1.9.0 <1.10.0" kubernetesVersion: ">=1.9.0 <1.10.0"
# Need stretch as default in 1.10 (for nvme) # 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 # 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 providerID: aws
kubernetesVersion: ">=1.10.0" kubernetesVersion: ">=1.10.0"
- providerID: gce - providerID: gce
@ -35,10 +35,10 @@ spec:
recommendedVersion: 1.9.3 recommendedVersion: 1.9.3
requiredVersion: 1.9.0 requiredVersion: 1.9.0
- range: ">=1.8.0" - range: ">=1.8.0"
recommendedVersion: 1.8.6 recommendedVersion: 1.8.7
requiredVersion: 1.8.0 requiredVersion: 1.8.0
- range: ">=1.7.0" - range: ">=1.7.0"
recommendedVersion: 1.7.11 recommendedVersion: 1.7.12
requiredVersion: 1.7.0 requiredVersion: 1.7.0
- range: ">=1.6.0" - range: ">=1.6.0"
recommendedVersion: 1.6.13 recommendedVersion: 1.6.13
@ -55,22 +55,22 @@ spec:
#requiredVersion: 1.9.0-alpha.1 #requiredVersion: 1.9.0-alpha.1
kubernetesVersion: 1.9.3 kubernetesVersion: 1.9.3
- range: ">=1.8.0-alpha.1" - range: ">=1.8.0-alpha.1"
recommendedVersion: 1.8.0 recommendedVersion: 1.8.1
#requiredVersion: 1.8.0 requiredVersion: 1.7.1
kubernetesVersion: 1.8.6 kubernetesVersion: 1.8.7
- range: ">=1.7.0-alpha.1" - range: ">=1.7.0-alpha.1"
recommendedVersion: 1.7.1 recommendedVersion: 1.8.1
#requiredVersion: 1.7.0 requiredVersion: 1.7.1
kubernetesVersion: 1.7.11 kubernetesVersion: 1.7.12
- range: ">=1.6.0-alpha.1" - range: ">=1.6.0-alpha.1"
#recommendedVersion: 1.6.0 recommendedVersion: 1.8.1
#requiredVersion: 1.6.0 requiredVersion: 1.7.1
kubernetesVersion: 1.6.13 kubernetesVersion: 1.6.13
- range: ">=1.5.0-alpha1" - range: ">=1.5.0-alpha1"
recommendedVersion: 1.5.1 recommendedVersion: 1.8.1
#requiredVersion: 1.5.1 requiredVersion: 1.7.1
kubernetesVersion: 1.5.8 kubernetesVersion: 1.5.8
- range: "<1.5.0" - range: "<1.5.0"
recommendedVersion: 1.4.4 recommendedVersion: 1.8.1
#requiredVersion: 1.4.4 requiredVersion: 1.7.1
kubernetesVersion: 1.4.12 kubernetesVersion: 1.4.12

8
cmd/kops/integration_test.go
View File

@ -320,7 +320,7 @@ func runTestAWS(t *testing.T, clusterName string, srcDir string, version string,
h := testutils.NewIntegrationTestHarness(t) h := testutils.NewIntegrationTestHarness(t)
defer h.Close() defer h.Close()
h.MockKopsVersion("1.7.0") h.MockKopsVersion("1.8.1")
h.SetupMockAWS() h.SetupMockAWS()
expectedFilenames := []string{ expectedFilenames := []string{
@ -358,7 +358,7 @@ func runTestPhase(t *testing.T, clusterName string, srcDir string, version strin
h := testutils.NewIntegrationTestHarness(t) h := testutils.NewIntegrationTestHarness(t)
defer h.Close() defer h.Close()
h.MockKopsVersion("1.7.0") h.MockKopsVersion("1.8.1")
h.SetupMockAWS() h.SetupMockAWS()
phaseName := string(phase) phaseName := string(phase)
if phaseName == "" { if phaseName == "" {
@ -406,7 +406,7 @@ func runTestGCE(t *testing.T, clusterName string, srcDir string, version string,
h := testutils.NewIntegrationTestHarness(t) h := testutils.NewIntegrationTestHarness(t)
defer h.Close() defer h.Close()
h.MockKopsVersion("1.7.0") h.MockKopsVersion("1.8.1")
h.SetupMockGCE() h.SetupMockGCE()
expectedFilenames := []string{ expectedFilenames := []string{
@ -438,7 +438,7 @@ func runTestCloudformation(t *testing.T, clusterName string, srcDir string, vers
h := testutils.NewIntegrationTestHarness(t) h := testutils.NewIntegrationTestHarness(t)
defer h.Close() defer h.Close()
h.MockKopsVersion("1.7.0") h.MockKopsVersion("1.8.1")
h.SetupMockAWS() h.SetupMockAWS()
factory := util.NewFactory(factoryOptions) factory := util.NewFactory(factoryOptions)

2
cmd/kops/lifecycle_integration_test.go
View File

@ -135,7 +135,7 @@ func runLifecycleTestAWS(o *LifecycleTestOptions) {
h := testutils.NewIntegrationTestHarness(o.t) h := testutils.NewIntegrationTestHarness(o.t)
defer h.Close() defer h.Close()
h.MockKopsVersion("1.7.0") h.MockKopsVersion("1.8.1")
h.SetupMockAWS() h.SetupMockAWS()
runLifecycleTest(h, o) runLifecycleTest(h, o)

4
tests/integration/create_cluster/complex/expected-v1alpha2.yaml
View File

@ -54,7 +54,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: master-us-test-1a name: master-us-test-1a
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -74,7 +74,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: nodes name: nodes
spec: 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 machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

8
tests/integration/create_cluster/ha/expected-v1alpha1.yaml
View File

@ -62,7 +62,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -82,7 +82,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -102,7 +102,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -122,7 +122,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes name: nodes
spec: 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 machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

8
tests/integration/create_cluster/ha/expected-v1alpha2.yaml
View File

@ -70,7 +70,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -90,7 +90,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -110,7 +110,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -130,7 +130,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes name: nodes
spec: 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 machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

8
tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml
View File

@ -68,7 +68,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -88,7 +88,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -108,7 +108,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -128,7 +128,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes name: nodes
spec: 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 machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

8
tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml
View File

@ -76,7 +76,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -96,7 +96,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -116,7 +116,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -136,7 +136,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes name: nodes
spec: 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 machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

4
tests/integration/create_cluster/overrides/expected-v1alpha2.yaml
View File

@ -57,7 +57,7 @@ metadata:
kops.k8s.io/cluster: overrides.example.com kops.k8s.io/cluster: overrides.example.com
name: master-us-test-1a name: master-us-test-1a
spec: 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 machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -77,7 +77,7 @@ metadata:
kops.k8s.io/cluster: overrides.example.com kops.k8s.io/cluster: overrides.example.com
name: nodes name: nodes
spec: 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 machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

24
tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml
View File

@ -27,8 +27,8 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda
set -o nounset set -o nounset
set -o pipefail set -o pipefail
NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/nodeup NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/nodeup
NODEUP_HASH=2a7b5fdd443e7c91c0af84593e2111c1a4105b79 NODEUP_HASH=bb41724c37d15ab7e039e06230e742b9b38d0808
@ -265,7 +265,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda
- c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet - 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 - 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 - 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 ClusterName: additionaluserdata.example.com
ConfigBase: memfs://clusters.example.com/additionaluserdata.example.com ConfigBase: memfs://clusters.example.com/additionaluserdata.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
@ -276,9 +276,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda
channels: channels:
- memfs://clusters.example.com/additionaluserdata.example.com/addons/bootstrap-channel.yaml - memfs://clusters.example.com/additionaluserdata.example.com/addons/bootstrap-channel.yaml
protokubeImage: protokubeImage:
hash: 5bd97a02f0793d1906e9f446c548ececf1444737 hash: 0b1f26208f8f6cc02468368706d0236670fec8a2
name: protokube:1.7.0 name: protokube:1.8.1
source: https://kubeupv2.s3.amazonaws.com/kops/1.7.0/images/protokube.tar.gz source: https://kubeupv2.s3.amazonaws.com/kops/1.8.1/images/protokube.tar.gz
__EOF_KUBE_ENV __EOF_KUBE_ENV
@ -325,8 +325,8 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro
set -o nounset set -o nounset
set -o pipefail set -o pipefail
NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/nodeup NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/nodeup
NODEUP_HASH=2a7b5fdd443e7c91c0af84593e2111c1a4105b79 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 - 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 - 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 - 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 ClusterName: additionaluserdata.example.com
ConfigBase: memfs://clusters.example.com/additionaluserdata.example.com ConfigBase: memfs://clusters.example.com/additionaluserdata.example.com
InstanceGroupName: nodes InstanceGroupName: nodes
@ -504,9 +504,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro
channels: channels:
- memfs://clusters.example.com/additionaluserdata.example.com/addons/bootstrap-channel.yaml - memfs://clusters.example.com/additionaluserdata.example.com/addons/bootstrap-channel.yaml
protokubeImage: protokubeImage:
hash: 5bd97a02f0793d1906e9f446c548ececf1444737 hash: 0b1f26208f8f6cc02468368706d0236670fec8a2
name: protokube:1.7.0 name: protokube:1.8.1
source: https://kubeupv2.s3.amazonaws.com/kops/1.7.0/images/protokube.tar.gz source: https://kubeupv2.s3.amazonaws.com/kops/1.8.1/images/protokube.tar.gz
__EOF_KUBE_ENV __EOF_KUBE_ENV

24
tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml
View File

@ -18,8 +18,8 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
set -o nounset set -o nounset
set -o pipefail set -o pipefail
NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/nodeup NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/nodeup
NODEUP_HASH=2a7b5fdd443e7c91c0af84593e2111c1a4105b79 NODEUP_HASH=bb41724c37d15ab7e039e06230e742b9b38d0808
@ -256,7 +256,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
- c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet - 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 - 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 - 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 ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
@ -267,9 +267,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
channels: channels:
- memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml
protokubeImage: protokubeImage:
hash: 5bd97a02f0793d1906e9f446c548ececf1444737 hash: 0b1f26208f8f6cc02468368706d0236670fec8a2
name: protokube:1.7.0 name: protokube:1.8.1
source: https://kubeupv2.s3.amazonaws.com/kops/1.7.0/images/protokube.tar.gz source: https://kubeupv2.s3.amazonaws.com/kops/1.8.1/images/protokube.tar.gz
__EOF_KUBE_ENV __EOF_KUBE_ENV
@ -295,8 +295,8 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use
set -o nounset set -o nounset
set -o pipefail set -o pipefail
NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.7.0/linux/amd64/nodeup NODEUP_URL=https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/nodeup
NODEUP_HASH=2a7b5fdd443e7c91c0af84593e2111c1a4105b79 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 - 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 - 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 - 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 ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: nodes InstanceGroupName: nodes
@ -474,9 +474,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use
channels: channels:
- memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml
protokubeImage: protokubeImage:
hash: 5bd97a02f0793d1906e9f446c548ececf1444737 hash: 0b1f26208f8f6cc02468368706d0236670fec8a2
name: protokube:1.7.0 name: protokube:1.8.1
source: https://kubeupv2.s3.amazonaws.com/kops/1.7.0/images/protokube.tar.gz source: https://kubeupv2.s3.amazonaws.com/kops/1.8.1/images/protokube.tar.gz
__EOF_KUBE_ENV __EOF_KUBE_ENV

2
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -826,7 +826,7 @@ func (c *ApplyClusterCmd) validateKopsVersion() error {
fmt.Printf("A new kops version is available: %s\n", recommended) fmt.Printf("A new kops version is available: %s\n", recommended)
} }
fmt.Printf("\n") 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("(you can bypass this check by exporting KOPS_RUN_OBSOLETE_VERSION)\n")
fmt.Printf("\n") fmt.Printf("\n")
fmt.Printf("More information: %s\n", buildPermalink("upgrade_kops", recommended.String())) fmt.Printf("More information: %s\n", buildPermalink("upgrade_kops", recommended.String()))