Commit 5099bc55 authored by Justin Santa Barbara's avatar Justin Santa Barbara
Browse files

Tag 1.8.0

parent 0e7dc55d
Showing with 18 additions and 18 deletions
+18 -18
......@@ -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.2
DNS_CONTROLLER_TAG=1.8.0
KOPS_RELEASE_VERSION = 1.8.0-beta.2
KOPS_CI_VERSION = 1.8.0-beta.3
KOPS_RELEASE_VERSION = 1.8.0
KOPS_CI_VERSION = 1.8.1-beta.1
# kops local location
KOPS = ${LOCAL}/kops
......
......@@ -48,7 +48,7 @@ spec:
requiredVersion: 1.4.2
kopsVersions:
- range: ">=1.8.0-alpha.1"
recommendedVersion: 1.8.0-beta.2
recommendedVersion: 1.8.0
#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.2", # keep
"k8s.io/kops.Version": "1.8.0", # 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.2
version: v1.8.0
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.2
version: v1.8.0
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.2
image: kope/dns-controller:1.8.0
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.2
version: v1.8.0
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.2
version: v1.8.0
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.2
image: kope/dns-controller:1.8.0
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.2"
version := "1.8.0"
{
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.2
version: 1.8.0
- 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.2
version: 1.8.0
- 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.2
version: 1.8.0
- 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.2
version: 1.8.0
- 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.2
version: 1.8.0
- 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.2
version: 1.8.0
- id: v1.7.0
kubernetesVersion: '>=1.7.0'
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment