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

Merge pull request #2238 from justinsb/release_160_alpha1 

Version updates for 1.6.0-alpha.1
This commit is contained in:
Justin Santa Barbara 2017-03-30 10:38:27 -04:00 committed by GitHub
parent 014204b60e 5a539882b0
commit a4ea3ea5da
12 changed files with 61 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -29,10 +29,10 @@ GOVERSION=1.7.5
MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.5.2
DNS_CONTROLLER_TAG=1.6.0
KOPS_RELEASE_VERSION=1.5.3
KOPS_CI_VERSION=1.6.0-alpha.0
KOPS_RELEASE_VERSION=1.6.0-alpha.1
KOPS_CI_VERSION=1.6.0-alpha.2
GITSHA := $(shell cd ${GOPATH_1ST}/src/k8s.io/kops; git describe --always)
@ -326,6 +326,15 @@ channels: channels-gocode
channels-gocode:
go install ${EXTRA_BUILDFLAGS} -ldflags "-X k8s.io/kops.Version=${VERSION} ${EXTRA_LDFLAGS}" k8s.io/kops/channels/cmd/channels
# --------------------------------------------------
# release tasks
release-tag:
git tag ${KOPS_RELEASE_VERSION}
release-github:
shipbot -tag ${KOPS_RELEASE_VERSION}
# --------------------------------------------------
# API / embedding examples

8
channels/alpha
View File

@ -10,17 +10,21 @@ spec:
- providerID: gce
name: "cos-cloud/cos-stable-56-9000-84-2"
cluster:
kubernetesVersion: v1.5.4
kubernetesVersion: v1.5.6
networking:
kubenet: {}
kubernetesVersions:
- range: ">=1.5.0"
recommendedVersion: 1.5.4
recommendedVersion: 1.5.6
requiredVersion: 1.5.1
- range: "<1.5.0"
recommendedVersion: 1.4.9
requiredVersion: 1.4.2
kopsVersions:
- range: ">=1.6.0-alpha.1"
#recommendedVersion: 1.6.0
#requiredVersion: 1.6.0
kubernetesVersion: 1.6.0
- range: ">=1.5.0-alpha1"
recommendedVersion: 1.5.1
#requiredVersion: 1.5.1

7
docs/development/release.md
View File

@ -48,7 +48,7 @@ make ci
## Push new dns-controller image if needed
```
make dns-controller-push DNS_CONTROLLER_TAG=1.5.1 DOCKER_REGISTRY=kope
make dns-controller-push DOCKER_REGISTRY=kope
```
## Upload new version
@ -63,8 +63,7 @@ make upload S3_BUCKET=s3://kubeupv2
Make sure you are on the release branch `git checkout release-1.X`
```
export TAG=1.5.0-alpha4
git tag ${TAG}
make release-tag
git push --tags
```
@ -80,7 +79,7 @@ versions to that.
Manually create a release on github & upload, but soon we'll publish shipbot which automates this...
```
bazel run //cmd/shipbot -- -tag ${TAG}
make release-github
```

6
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.5.2.yaml.template → upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.5.yaml.template
View File

@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.5.2
version: v1.6.0
spec:
replicas: 1
selector:
@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.5.2
version: v1.6.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.5.2
image: kope/dns-controller:1.6.0
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"

6
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/v1.6.0.yaml.template → upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
View File

@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.5.2
version: v1.6.0
spec:
replicas: 1
selector:
@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.5.2
version: v1.6.0
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
@ -31,7 +31,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.5.2
image: kope/dns-controller:1.6.0
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"

0
upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/v1.5.1.yaml.template → upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.5.yaml.template
View File

0
upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/v1.6.0.yaml.template → upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template
View File

151
upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/v1.4.0.yaml.template
View File

@ -1,151 +0,0 @@
# Copyright 2016 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: kube-dns-v20
namespace: kube-system
labels:
k8s-addon: kube-dns.addons.k8s.io
k8s-app: kube-dns
version: v20
kubernetes.io/cluster-service: "true"
spec:
replicas: {{ KubeDNS.Replicas }}
selector:
matchLabels:
k8s-app: kube-dns
version: v20
template:
metadata:
labels:
k8s-app: kube-dns
version: v20
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.8
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
# guaranteed class. Currently, this container falls into the
# "burstable" category so the kubelet doesn't backoff from restarting it.
limits:
memory: 170Mi
requests:
cpu: 100m
memory: 70Mi
livenessProbe:
httpGet:
path: /healthz-kubedns
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
readinessProbe:
httpGet:
path: /readiness
port: 8081
scheme: HTTP
# we poll on pod startup for the Kubernetes master service and
# only setup the /readiness HTTP server once that's available.
initialDelaySeconds: 3
timeoutSeconds: 5
args:
# command = "/kube-dns"
- --domain={{ KubeDNS.Domain }}.
- --dns-port=10053
ports:
- containerPort: 10053
name: dns-local
protocol: UDP
- containerPort: 10053
name: dns-tcp-local
protocol: TCP
- name: dnsmasq
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
livenessProbe:
httpGet:
path: /healthz-dnsmasq
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
args:
- --cache-size=1000
- --no-resolv
- --server=127.0.0.1#10053
- --log-facility=-
ports:
- containerPort: 53
name: dns
protocol: UDP
- containerPort: 53
name: dns-tcp
protocol: TCP
- name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.2
resources:
limits:
memory: 50Mi
requests:
cpu: 10m
# Note that this container shouldn't really need 50Mi of memory. The
# limits are set higher than expected pending investigation on #29688.
# The extra memory was stolen from the kubedns container to keep the
# net memory requested by the pod constant.
memory: 50Mi
args:
- --cmd=nslookup kubernetes.default.svc.{{ KubeDNS.Domain }} 127.0.0.1 >/dev/null
- --url=/healthz-dnsmasq
- --cmd=nslookup kubernetes.default.svc.{{ KubeDNS.Domain }} 127.0.0.1:10053 >/dev/null
- --url=/healthz-kubedns
- --port=8080
- --quiet
ports:
- containerPort: 8080
protocol: TCP
dnsPolicy: Default # Don't use cluster DNS.
---
apiVersion: v1
kind: Service
metadata:
name: kube-dns
namespace: kube-system
labels:
k8s-addon: kube-dns.addons.k8s.io
k8s-app: kube-dns
kubernetes.io/cluster-service: "true"
kubernetes.io/name: "KubeDNS"
spec:
selector:
k8s-app: kube-dns
clusterIP: {{ KubeDNS.ServerIP }}
ports:
- name: dns
port: 53
protocol: UDP
- name: dns-tcp
port: 53
protocol: TCP

17
upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.5.0.yaml → upup/models/cloudup/resources/addons/storage-aws.addons.k8s.io/v1.6.0.yaml
View File

@ -2,10 +2,21 @@ apiVersion: storage.k8s.io/v1beta1
kind: StorageClass
metadata:
name: default
annotations:
storageclass.beta.kubernetes.io/is-default-class: "true"
labels:
kubernetes.io/cluster-service: "true"
k8s-addon: storage-aws.addons.k8s.io
provisioner: kubernetes.io/aws-ebs
parameters:
type: gp2
---
apiVersion: storage.k8s.io/v1beta1
kind: StorageClass
metadata:
name: gp2
annotations:
storageclass.beta.kubernetes.io/is-default-class: "true"
labels:
k8s-addon: storage-aws.addons.k8s.io
provisioner: kubernetes.io/aws-ebs
parameters:

16
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -97,15 +97,16 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
key := "kube-dns.addons.k8s.io"
var version string
var location string
switch {
case kv.Major == 1 && kv.Minor <= 5:
version = "1.5.1"
location = key + "/k8s-1.5.yaml"
default:
version = "1.6.0"
location = key + "/k8s-1.6.yaml"
}
location := key + "/v" + version + ".yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key),
Version: fi.String(version),
@ -134,15 +135,18 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
key := "dns-controller.addons.k8s.io"
var version string
var location string
switch {
case kv.Major == 1 && kv.Minor <= 5:
version = "1.5.2"
// This is awkward... we would like to do version 1.6.0,
// but if we do then we won't get the new manifest when we upgrade to 1.6.0
version = "1.5.3"
location = key + "/k8s-1.5.yaml"
default:
version = "1.6.0"
location = key + "/k8s-1.6.yaml"
}
location := key + "/v" + version + ".yaml"
addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
Name: fi.String(key),
Version: fi.String(version),
@ -154,7 +158,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
{
key := "storage-aws.addons.k8s.io"
version := "1.5.0"
version := "1.6.0"
location := key + "/v" + version + ".yaml"

11
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
View File

@ -9,7 +9,7 @@ spec:
selector:
k8s-addon: core.addons.k8s.io
version: 1.4.0
- manifest: kube-dns.addons.k8s.io/v1.5.1.yaml
- manifest: kube-dns.addons.k8s.io/k8s-1.5.yaml
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
@ -19,19 +19,18 @@ spec:
selector:
k8s-addon: limit-range.addons.k8s.io
version: 1.5.0
- manifest: dns-controller.addons.k8s.io/v1.5.2.yaml
- manifest: dns-controller.addons.k8s.io/k8s-1.5.yaml
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.5.2
- manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
version: 1.5.3
- manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.5.0
version: 1.6.0
- manifest: networking.kope.io/v1.0.20161116.yaml
name: networking.kope.io
selector:
role.kubernetes.io/networking: "1"
version: 1.0.20161116

10
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View File

@ -9,7 +9,7 @@ spec:
selector:
k8s-addon: core.addons.k8s.io
version: 1.4.0
- manifest: kube-dns.addons.k8s.io/v1.5.1.yaml
- manifest: kube-dns.addons.k8s.io/k8s-1.5.yaml
name: kube-dns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
@ -19,13 +19,13 @@ spec:
selector:
k8s-addon: limit-range.addons.k8s.io
version: 1.5.0
- manifest: dns-controller.addons.k8s.io/v1.5.2.yaml
- manifest: dns-controller.addons.k8s.io/k8s-1.5.yaml
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.5.2
- manifest: storage-aws.addons.k8s.io/v1.5.0.yaml
version: 1.5.3
- manifest: storage-aws.addons.k8s.io/v1.6.0.yaml
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.5.0
version: 1.6.0