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.22.0-beta.2 #12467

Merged
merged 1 commit into from
Oct 2, 2021
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 @@ -64,13 +64,13 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
# 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.22.0-beta.1
DNS_CONTROLLER_TAG=1.22.0-beta.2
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.22.0-beta.1
KOPS_CONTROLLER_TAG=1.22.0-beta.2
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.22.0-beta.1
KUBE_APISERVER_HEALTHCHECK_TAG=1.22.0-beta.2
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')


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 @@ -79,7 +79,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2
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 @@ -12,7 +12,7 @@ Contents: |
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
addons:
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793
manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
Expand Down Expand Up @@ -40,7 +40,7 @@ spec:
version: 9.99.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 6de1dca5e9fd89b3781f632bf74aee0a67d0416ca236ecc69811b39acb475271
manifestHash: b4524ab5361fe3df3ff58ddd183178056077f16989efe551b1ddbeb7dd3ba9a0
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
name: dns-controller
namespace: kube-system
spec:
Expand All @@ -24,7 +24,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
spec:
containers:
- command:
Expand All @@ -41,7 +41,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1
image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2
name: dns-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
name: kops-controller
namespace: kube-system
spec:
Expand All @@ -37,7 +37,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
spec:
containers:
- command:
Expand All @@ -47,7 +47,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1
image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2
name: kops-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
addons:
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: f2c9b0504bb2f4d41b2f4c9b2e724ce29796e1b471a1c8b735792081e8542d45
manifestHash: 94bed75e9c3349e4b530e86f291a61a25ac7f16934970dca38120ca5c7e2a153
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
Expand Down Expand Up @@ -40,7 +40,7 @@ spec:
version: 9.99.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a
manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
name: dns-controller
namespace: kube-system
spec:
Expand All @@ -24,7 +24,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
spec:
containers:
- command:
Expand All @@ -37,7 +37,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1
image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2
name: dns-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
name: kops-controller
namespace: kube-system
spec:
Expand All @@ -37,7 +37,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
spec:
containers:
- command:
Expand All @@ -47,7 +47,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1
image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2
name: kops-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
addons:
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 7c16913e664b7d72e87d3a306bb3ed4be1cbd5d7018fcfeb3b382cc85be20572
manifestHash: 8a244779bf382c65e026f663b4c166b0f7d4bdbfd8ecf06d8248690a1a2af189
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
Expand Down Expand Up @@ -40,7 +40,7 @@ spec:
version: 9.99.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a
manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
name: dns-controller
namespace: kube-system
spec:
Expand All @@ -24,7 +24,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
spec:
containers:
- command:
Expand All @@ -37,7 +37,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1
image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2
name: dns-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
name: kops-controller
namespace: kube-system
spec:
Expand All @@ -37,7 +37,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
spec:
containers:
- command:
Expand All @@ -47,7 +47,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1
image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2
name: kops-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
addons:
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 72c5e40d4a3d0fba1f89372594b3d58a422af0b2767e58e3d92013e06a03fbce
manifestHash: fc60bdf20bdd5a427b00050f2b19a086f1f8dce8669f1d9b81e37754b71b320c
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
Expand Down Expand Up @@ -40,7 +40,7 @@ spec:
version: 9.99.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a
manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
name: dns-controller
namespace: kube-system
spec:
Expand All @@ -24,7 +24,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
spec:
containers:
- command:
Expand All @@ -37,7 +37,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1
image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2
name: dns-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ metadata:
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
name: kops-controller
namespace: kube-system
spec:
Expand All @@ -37,7 +37,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.22.0-beta.1
version: v1.22.0-beta.2
spec:
containers:
- command:
Expand All @@ -47,7 +47,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1
image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2
name: kops-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
addons:
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 66dd7a9201516a116851ebe8b1933502971eb583d1650ae916574b673ec55d4e
manifestHash: 620f80356912074640ea2e43ada1cdf61aa1e1969b9c32f5a4c94c6d8e808acd
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
Expand Down Expand Up @@ -40,7 +40,7 @@ spec:
version: 9.99.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a
manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
Expand Down
Loading