mirror of https://github.com/kubernetes/kops.git
Bump versions to 1.8.0-beta.2
This commit is contained in:
Justin Santa Barbara
parent
305ffcc1af
commit
b8b7287e4a
6
Makefile
6
Makefile
|
|
@ -43,10 +43,10 @@ SOURCES:=$(shell find . -name "*.go")
|
|||
MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
|
||||
|
||||
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
|
||||
DNS_CONTROLLER_TAG=1.8.0-beta.1
|
||||
DNS_CONTROLLER_TAG=1.8.0-beta.2
|
||||
|
||||
KOPS_RELEASE_VERSION = 1.8.0-beta.1
|
||||
KOPS_CI_VERSION = 1.8.0-beta.2
|
||||
KOPS_RELEASE_VERSION = 1.8.0-beta.2
|
||||
KOPS_CI_VERSION = 1.8.0-beta.3
|
||||
|
||||
# kops local location
|
||||
KOPS = ${LOCAL}/kops
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ spec:
|
|||
requiredVersion: 1.4.2
|
||||
kopsVersions:
|
||||
- range: ">=1.8.0-alpha.1"
|
||||
recommendedVersion: 1.8.0-beta.1
|
||||
recommendedVersion: 1.8.0-beta.2
|
||||
#requiredVersion: 1.8.0
|
||||
kubernetesVersion: 1.8.4
|
||||
- range: ">=1.7.0-alpha.1"
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ go_binary(
|
|||
library = ":go_default_library",
|
||||
visibility = ["//visibility:public"],
|
||||
x_defs = {
|
||||
"k8s.io/kops.Version": "1.8.0-beta.1", # keep
|
||||
"k8s.io/kops.Version": "1.8.0-beta.2", # keep
|
||||
"k8s.io/kops.GitVersion": "{BUILD_SCM_REVISION}", # keep
|
||||
},
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.8.0-beta.1
|
||||
version: v1.8.0-beta.2
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
|
|
@ -17,7 +17,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.8.0-beta.1
|
||||
version: v1.8.0-beta.2
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
|
||||
|
|
@ -33,7 +33,7 @@ spec:
|
|||
serviceAccount: dns-controller
|
||||
containers:
|
||||
- name: dns-controller
|
||||
image: kope/dns-controller:1.8.0-beta.1
|
||||
image: kope/dns-controller:1.8.0-beta.2
|
||||
command:
|
||||
{{ range $arg := DnsControllerArgv }}
|
||||
- "{{ $arg }}"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.8.0-beta.1
|
||||
version: v1.8.0-beta.2
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
|
|
@ -17,7 +17,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
k8s-app: dns-controller
|
||||
version: v1.8.0-beta.1
|
||||
version: v1.8.0-beta.2
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
|
||||
|
|
@ -28,7 +28,7 @@ spec:
|
|||
hostNetwork: true
|
||||
containers:
|
||||
- name: dns-controller
|
||||
image: kope/dns-controller:1.8.0-beta.1
|
||||
image: kope/dns-controller:1.8.0-beta.2
|
||||
command:
|
||||
{{ range $arg := DnsControllerArgv }}
|
||||
- "{{ $arg }}"
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
|
|||
if externalDNS == nil || !externalDNS.Disable {
|
||||
{
|
||||
key := "dns-controller.addons.k8s.io"
|
||||
version := "1.8.0-beta.1"
|
||||
version := "1.8.0-beta.2"
|
||||
|
||||
{
|
||||
location := key + "/pre-k8s-1.6.yaml"
|
||||
|
|
|
|||
|
|
@ -41,14 +41,14 @@ spec:
|
|||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.8.0-beta.1
|
||||
version: 1.8.0-beta.2
|
||||
- id: k8s-1.6
|
||||
kubernetesVersion: '>=1.6.0'
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.8.0-beta.1
|
||||
version: 1.8.0-beta.2
|
||||
- id: v1.7.0
|
||||
kubernetesVersion: '>=1.7.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
|
||||
|
|
|
|||
|
|
@ -41,14 +41,14 @@ spec:
|
|||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.8.0-beta.1
|
||||
version: 1.8.0-beta.2
|
||||
- id: k8s-1.6
|
||||
kubernetesVersion: '>=1.6.0'
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.8.0-beta.1
|
||||
version: 1.8.0-beta.2
|
||||
- id: v1.7.0
|
||||
kubernetesVersion: '>=1.7.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
|
||||
|
|
|
|||
|
|
@ -41,14 +41,14 @@ spec:
|
|||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.8.0-beta.1
|
||||
version: 1.8.0-beta.2
|
||||
- id: k8s-1.6
|
||||
kubernetesVersion: '>=1.6.0'
|
||||
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
|
||||
name: dns-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: dns-controller.addons.k8s.io
|
||||
version: 1.8.0-beta.1
|
||||
version: 1.8.0-beta.2
|
||||
- id: v1.7.0
|
||||
kubernetesVersion: '>=1.7.0'
|
||||
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
|
||||
|
|
|
|||
Loading…
Reference in New Issue