Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.19.0-alpha.3 #9801

Merged
merged 3 commits into from
Aug 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ unexport KOPS_BASE_URL KOPS_CLUSTER_NAME KOPS_RUN_OBSOLETE_VERSION KOPS_STATE_ST
unexport SKIP_REGION_CHECK S3_ACCESS_KEY_ID S3_ENDPOINT S3_REGION S3_SECRET_ACCESS_KEY

# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.19.0-alpha.2
DNS_CONTROLLER_TAG=1.19.0-alpha.3
# Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
KOPS_CONTROLLER_TAG=1.19.0-alpha.2
KOPS_CONTROLLER_TAG=1.19.0-alpha.3
# Keep in sync with pkg/model/components/kubeapiserver/model.go
KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-alpha.2
KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-alpha.3


VERSION=$(shell tools/get_version.sh | grep VERSION | awk '{print $$2}')
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-bindata.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cd "${KOPS_ROOT}"

make update-bindata

changes=$(git status --porcelain || true)
changes=$(git status --porcelain --untracked-files=no || true)
if [ -n "${changes}" ]; then
echo "ERROR: bindata is not up to date; please run: make update-bindata"
echo "git diff:"
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cd "${KOPS_ROOT}"

make crds

changed_files=$(git status --porcelain || true)
changed_files=$(git status --porcelain --untracked-files=no || true)
if [ -n "${changed_files}" ]; then
echo "Detected that generation is needed; run 'make crds'"
echo "changed files:"
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-gomod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cd "${KOPS_ROOT}"

make gomod

changes=$(git status --porcelain || true)
changes=$(git status --porcelain go.mod go.sum vendor/ || true)
if [ -n "${changes}" ]; then
echo "ERROR: go modules are not up to date; please run: make gomod"
echo "changed files:"
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-shellcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set -o pipefail

# required version for this script, if not installed on the host we will
# use the official docker image instead. keep this in sync with SHELLCHECK_IMAGE
SHELLCHECK_VERSION="0.7.0"
SHELLCHECK_VERSION="0.7.1"
# upstream shellcheck latest stable image as of October 23rd, 2019
SHELLCHECK_IMAGE="koalaman/shellcheck-alpine:v0.7.0@sha256:24bbf52aae6eaa27accc9f61de32d30a1498555e6ef452966d0702ff06f38ecb"

Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/kubeapiserver/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: kope/kube-apiserver-healthcheck:1.19.0-alpha.2
image: kope/kube-apiserver-healthcheck:1.19.0-alpha.3
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Contents:
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: kope/kube-apiserver-healthcheck:1.19.0-alpha.2
image: kope/kube-apiserver-healthcheck:1.19.0-alpha.3
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
18 changes: 9 additions & 9 deletions upup/models/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
spec:
replicas: 1
strategy:
Expand All @@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
Expand All @@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.19.0-alpha.2
image: kope/dns-controller:1.19.0-alpha.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
spec:
replicas: 1
selector:
Expand All @@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
Expand All @@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.19.0-alpha.2
image: kope/dns-controller:1.19.0-alpha.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
spec:
selector:
matchLabels:
Expand All @@ -33,7 +33,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
spec:
priorityClassName: system-node-critical
tolerations:
Expand All @@ -46,7 +46,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: kope/kops-controller:1.19.0-alpha.2
image: kope/kops-controller:1.19.0-alpha.3
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs
Expand Down
4 changes: 2 additions & 2 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {

{
key := "kops-controller.addons.k8s.io"
version := "1.19.0-alpha.2"
version := "1.19.0-alpha.3"

{
location := key + "/k8s-1.16.yaml"
Expand Down Expand Up @@ -372,7 +372,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.19.0-alpha.2"
version := "1.19.0-alpha.3"

{
location := key + "/k8s-1.6.yaml"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 7a7039ba3b0e9c0027e486902fba3c6d266cbb46
manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-alpha.2
version: 1.19.0-alpha.3
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
Expand Down Expand Up @@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120
manifestHash: a3f11d5dccd7f62f41e808a5b3cb7b85f931fec7
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.2
version: 1.19.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: ba7fda2da673525d3ff898636fa2d9d2ea16dffa
manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.2
version: 1.19.0-alpha.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 7a7039ba3b0e9c0027e486902fba3c6d266cbb46
manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-alpha.2
version: 1.19.0-alpha.3
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
Expand Down Expand Up @@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: efb6c7b28be1e4cfe493f01b4a9f81a54f69f120
manifestHash: a3f11d5dccd7f62f41e808a5b3cb7b85f931fec7
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.2
version: 1.19.0-alpha.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: ba7fda2da673525d3ff898636fa2d9d2ea16dffa
manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.2
version: 1.19.0-alpha.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
name: dns-controller
namespace: kube-system
spec:
Expand All @@ -21,7 +21,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
spec:
containers:
- command:
Expand All @@ -34,7 +34,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: kope/dns-controller:1.19.0-alpha.2
image: kope/dns-controller:1.19.0-alpha.3
name: dns-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
name: kops-controller
namespace: kube-system
spec:
Expand All @@ -29,14 +29,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.2
version: v1.19.0-alpha.3
spec:
containers:
- command:
- /kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: kope/kops-controller:1.19.0-alpha.2
image: kope/kops-controller:1.19.0-alpha.3
name: kops-controller
resources:
requests:
Expand Down
Loading