Skip to content

Commit

Permalink
Merge pull request #10494 from hakman/release--1.19.0-beta.3
Browse files Browse the repository at this point in the history 
Release 1.19.0-beta.3
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed Dec 23, 2020
2 parents d87b56d + aec7f2a commit e43f1cc
Show file tree
Hide file tree
Showing 24 changed files with 99 additions and 99 deletions.
6 changes: 3 additions & 3 deletions Makefile
View file
Expand Up @@ -67,13 +67,13 @@ PROTOKUBE_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_PROTOKUBE_TAG
# We lock the versions of our controllers also
# We need to keep in sync with:
# upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.19.0-beta.2
DNS_CONTROLLER_TAG=1.19.0-beta.3
DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
# upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
KOPS_CONTROLLER_TAG=1.19.0-beta.2
KOPS_CONTROLLER_TAG=1.19.0-beta.3
KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
# pkg/model/components/kubeapiserver/model.go
KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-beta.2
KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-beta.3
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')


Expand Down
6 changes: 3 additions & 3 deletions docs/release-process.md
View file
Expand Up @@ -164,7 +164,7 @@ Create container promotion PR:
```
cd ${GOPATH}/src/k8s.io/k8s.io
git co -b kops_images_${VERSION}
git checkout -b kops_images_${VERSION}
cd k8s.gcr.io/images/k8s-staging-kops
echo "" >> images.yaml
Expand Down Expand Up @@ -194,8 +194,8 @@ Create binary promotion PR:
```
cd ${GOPATH}/src/k8s.io/k8s.io
git co master
git co -b kops_artifacts_${VERSION}
git checkout master
git checkout -b kops_artifacts_${VERSION}
mkdir -p ./k8s-staging-kops/kops/releases/${VERSION}/
gsutil rsync -r gs://k8s-staging-kops/kops/releases/${VERSION}/ ./k8s-staging-kops/kops/releases/${VERSION}/
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/kubeapiserver/model.go
View file
Expand Up @@ -95,7 +95,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.2
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.3
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
View file
Expand Up @@ -14,7 +14,7 @@ Contents:
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.2
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-beta.3
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
18 changes: 9 additions & 9 deletions upup/models/bindata.go
View file

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

6 changes: 3 additions & 3 deletions upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
View file
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-beta.2
version: v1.19.0-beta.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-beta.2
version: v1.19.0-beta.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
Expand All @@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
Expand Down
6 changes: 3 additions & 3 deletions upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
View file
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-beta.2
version: v1.19.0-beta.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-beta.2
version: v1.19.0-beta.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: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
Expand Down
6 changes: 3 additions & 3 deletions upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
View file
Expand Up @@ -19,7 +19,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-beta.2
version: v1.19.0-beta.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-beta.2
version: v1.19.0-beta.3
{{ if UseKopsControllerForNodeBootstrap }}
annotations:
dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
Expand All @@ -51,7 +51,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2
image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.3
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs
Expand Down
6 changes: 3 additions & 3 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Expand Up @@ -172,7 +172,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann

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

{
location := key + "/k8s-1.16.yaml"
Expand All @@ -191,7 +191,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann

if featureflag.PublicJWKS.Enabled() {
key := "anonymous-issuer-discovery.addons.k8s.io"
version := "1.19.0-beta.2"
version := "1.19.0-beta.3"

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

{
location := key + "/k8s-1.6.yaml"
Expand Down
12 changes: 6 additions & 6 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View file
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: 5b7765907ec5720081c13c0cab2d32b99053e7c8
manifestHash: ab5b9c27062ceec773719f25fe727d4459f8c8ec
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-beta.2
version: 1.19.0-beta.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: 8ea4cfe1b036ac2c03f570066799a5e13928db04
manifestHash: ea252e459da01e9db6401a9e37ea6f70114bb820
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-beta.2
version: 1.19.0-beta.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440
manifestHash: 835e6b9944ab3c39ce3e7e99bb290a2ddaa2222c
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-beta.2
version: 1.19.0-beta.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
12 changes: 6 additions & 6 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
View file
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: 68aa7f9ecd2d264b5b1dbc5c72d161420f455427
manifestHash: 06a474c5820eca550fc93835350e3ea43fc501cc
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-beta.2
version: 1.19.0-beta.3
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
Expand Down Expand Up @@ -50,19 +50,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 8ea4cfe1b036ac2c03f570066799a5e13928db04
manifestHash: ea252e459da01e9db6401a9e37ea6f70114bb820
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-beta.2
version: 1.19.0-beta.3
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 8b44f8925352ceb1e59d8edd66bb4e0471a11440
manifestHash: 835e6b9944ab3c39ce3e7e99bb290a2ddaa2222c
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-beta.2
version: 1.19.0-beta.3
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
6 changes: 3 additions & 3 deletions ...i/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
View file
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-beta.2
version: v1.19.0-beta.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-beta.2
version: v1.19.0-beta.3
spec:
containers:
- command:
Expand All @@ -34,7 +34,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.2
image: k8s.gcr.io/kops/dns-controller:1.19.0-beta.3
name: dns-controller
resources:
requests:
Expand Down
6 changes: 3 additions & 3 deletions .../cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
View file
Expand Up @@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-beta.2
version: v1.19.0-beta.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-beta.2
version: v1.19.0-beta.3
spec:
containers:
- command:
- /kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.2
image: k8s.gcr.io/kops/kops-controller:1.19.0-beta.3
name: kops-controller
resources:
requests:
Expand Down

0 comments on commit e43f1cc

Please sign in to comment.