Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kops
Commits
0b4e236a
Unverified
Commit
0b4e236a
authored
3 years ago
by
Kubernetes Prow Robot
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #13302 from justinsb/release_1.23.0-beta.2
Release 1.23.0-beta.2
parents
6b316881
0dc21d05
Changes
231
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
Makefile
+3
-3
Makefile
pkg/model/components/kubeapiserver/model.go
+1
-1
pkg/model/components/kubeapiserver/model.go
pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
+1
-1
pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content
+1
-1
...bject_manifests-static-kube-apiserver-healthcheck_content
tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+2
-2
...ucket_object_minimal.example.com-addons-bootstrap_content
tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+3
-3
....com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+3
-3
...com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content
+1
-1
...bject_manifests-static-kube-apiserver-healthcheck_content
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+2
-2
...ucket_object_minimal.example.com-addons-bootstrap_content
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+3
-3
....com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+3
-3
...com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content
+2
-2
...ject_bastionuserdata.example.com-addons-bootstrap_content
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+3
-3
....com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+3
-3
...com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content
+1
-1
...bject_manifests-static-kube-apiserver-healthcheck_content
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-bootstrap_content
+2
-2
...ucket_object_complex.example.com-addons-bootstrap_content
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+3
-3
....com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+3
-3
...com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content
+1
-1
...bject_manifests-static-kube-apiserver-healthcheck_content
tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-bootstrap_content
+2
-2
...cket_object_compress.example.com-addons-bootstrap_content
with
43 additions
and
43 deletions
+43
-43
Makefile
+
3
-
3
View file @
0b4e236a
...
@@ -69,13 +69,13 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
...
@@ -69,13 +69,13 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
# We lock the versions of our controllers also
# We lock the versions of our controllers also
# We need to keep in sync with:
# We need to keep in sync with:
# upup/models/cloudup/resources/addons/dns-controller/
# upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG
=
1.23.0-beta.
1
DNS_CONTROLLER_TAG
=
1.23.0-beta.
2
DNS_CONTROLLER_PUSH_TAG
=
$(
shell
tools/get_workspace_status.sh |
grep
STABLE_DNS_CONTROLLER_TAG |
awk
'{print $$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/
# upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
KOPS_CONTROLLER_TAG
=
1.23.0-beta.
1
KOPS_CONTROLLER_TAG
=
1.23.0-beta.
2
KOPS_CONTROLLER_PUSH_TAG
=
$(
shell
tools/get_workspace_status.sh |
grep
STABLE_KOPS_CONTROLLER_TAG |
awk
'{print $$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
# pkg/model/components/kubeapiserver/model.go
KUBE_APISERVER_HEALTHCHECK_TAG
=
1.23.0-beta.
1
KUBE_APISERVER_HEALTHCHECK_TAG
=
1.23.0-beta.
2
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG
=
$(
shell
tools/get_workspace_status.sh |
grep
STABLE_KUBE_APISERVER_HEALTHCHECK_TAG |
awk
'{print $$2
}
'
)
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG
=
$(
shell
tools/get_workspace_status.sh |
grep
STABLE_KUBE_APISERVER_HEALTHCHECK_TAG |
awk
'{print $$2
}
'
)
...
...
This diff is collapsed.
Click to expand it.
pkg/model/components/kubeapiserver/model.go
+
1
-
1
View file @
0b4e236a
...
@@ -79,7 +79,7 @@ kind: Pod
...
@@ -79,7 +79,7 @@ kind: Pod
spec:
spec:
containers:
containers:
- name: healthcheck
- name: healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
2
livenessProbe:
livenessProbe:
httpGet:
httpGet:
# The sidecar serves a healthcheck on the same port,
# The sidecar serves a healthcheck on the same port,
...
...
This diff is collapsed.
Click to expand it.
pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
+
1
-
1
View file @
0b4e236a
...
@@ -12,7 +12,7 @@ Contents: |
...
@@ -12,7 +12,7 @@ Contents: |
- --client-key=/secrets/client.key
- --client-key=/secrets/client.key
command:
command:
- /kube-apiserver-healthcheck
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
2
livenessProbe:
livenessProbe:
httpGet:
httpGet:
host: 127.0.0.1
host: 127.0.0.1
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content
+
1
-
1
View file @
0b4e236a
...
@@ -10,7 +10,7 @@ spec:
...
@@ -10,7 +10,7 @@ spec:
- --client-key=/secrets/client.key
- --client-key=/secrets/client.key
command:
command:
- /kube-apiserver-healthcheck
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
2
livenessProbe:
livenessProbe:
httpGet:
httpGet:
host: 127.0.0.1
host: 127.0.0.1
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+
2
-
2
View file @
0b4e236a
...
@@ -6,7 +6,7 @@ spec:
...
@@ -6,7 +6,7 @@ spec:
addons:
addons:
- id: k8s-1.16
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash:
cd50b5276ebd2fa4d61459c89bb1fc886356ef825e75c94da97aa5b7fa6f7e87
manifestHash:
5e92805ad1436dd4572b3d0f026b78dba98f87f4d66458e3db84b9bb94cbbc71
name: kops-controller.addons.k8s.io
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
needsRollingUpdate: control-plane
selector:
selector:
...
@@ -40,7 +40,7 @@ spec:
...
@@ -40,7 +40,7 @@ spec:
version: 9.99.0
version: 9.99.0
- id: k8s-1.12
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash:
b9d699d9356b4da68e3c50574667faa2750f182ee53b4dd7b9432574d0b04fdb
manifestHash:
c4f494b2e520dac2bfb69dd5e31b7e7d7f0885b961f47d1a8e5a21acdcaee552
name: dns-controller.addons.k8s.io
name: dns-controller.addons.k8s.io
selector:
selector:
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+
3
-
3
View file @
0b4e236a
...
@@ -7,7 +7,7 @@ metadata:
...
@@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
k8s-app: dns-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
name: dns-controller
name: dns-controller
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -24,7 +24,7 @@ spec:
...
@@ -24,7 +24,7 @@ spec:
labels:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
k8s-app: dns-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
spec:
spec:
containers:
containers:
- command:
- command:
...
@@ -38,7 +38,7 @@ spec:
...
@@ -38,7 +38,7 @@ spec:
env:
env:
- name: KUBERNETES_SERVICE_HOST
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.23.0-beta.
1
image: k8s.gcr.io/kops/dns-controller:1.23.0-beta.
2
name: dns-controller
name: dns-controller
resources:
resources:
requests:
requests:
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/apiservernodes/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+
3
-
3
View file @
0b4e236a
...
@@ -23,7 +23,7 @@ metadata:
...
@@ -23,7 +23,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
k8s-app: kops-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
name: kops-controller
name: kops-controller
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -37,7 +37,7 @@ spec:
...
@@ -37,7 +37,7 @@ spec:
labels:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
k8s-app: kops-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
spec:
spec:
containers:
containers:
- command:
- command:
...
@@ -47,7 +47,7 @@ spec:
...
@@ -47,7 +47,7 @@ spec:
env:
env:
- name: KUBERNETES_SERVICE_HOST
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.23.0-beta.
1
image: k8s.gcr.io/kops/kops-controller:1.23.0-beta.
2
name: kops-controller
name: kops-controller
resources:
resources:
requests:
requests:
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content
+
1
-
1
View file @
0b4e236a
...
@@ -10,7 +10,7 @@ spec:
...
@@ -10,7 +10,7 @@ spec:
- --client-key=/secrets/client.key
- --client-key=/secrets/client.key
command:
command:
- /kube-apiserver-healthcheck
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
2
livenessProbe:
livenessProbe:
httpGet:
httpGet:
host: 127.0.0.1
host: 127.0.0.1
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
+
2
-
2
View file @
0b4e236a
...
@@ -6,7 +6,7 @@ spec:
...
@@ -6,7 +6,7 @@ spec:
addons:
addons:
- id: k8s-1.16
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash:
f8b826b498f5147565ee6aca4d80c513a1bd3d8ae457b77401b004c996c0d331
manifestHash:
010f876809a24318a6e1594380c247b621634d4cbb8f939f359df35b597a012f
name: kops-controller.addons.k8s.io
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
needsRollingUpdate: control-plane
selector:
selector:
...
@@ -40,7 +40,7 @@ spec:
...
@@ -40,7 +40,7 @@ spec:
version: 9.99.0
version: 9.99.0
- id: k8s-1.12
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash:
9312a7f41b75c69c562a83f80f0a6696c788a103a9e89a79eadd0b19debe9499
manifestHash:
5589e2ba284e92952d45a3551a8a0fa960ece354cfed67da4b8f3c4ca1e934d4
name: dns-controller.addons.k8s.io
name: dns-controller.addons.k8s.io
selector:
selector:
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+
3
-
3
View file @
0b4e236a
...
@@ -7,7 +7,7 @@ metadata:
...
@@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
k8s-app: dns-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
name: dns-controller
name: dns-controller
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -24,7 +24,7 @@ spec:
...
@@ -24,7 +24,7 @@ spec:
labels:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
k8s-app: dns-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
spec:
spec:
containers:
containers:
- command:
- command:
...
@@ -42,7 +42,7 @@ spec:
...
@@ -42,7 +42,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
value: /var/run/secrets/amazonaws.com/token
image: k8s.gcr.io/kops/dns-controller:1.23.0-beta.
1
image: k8s.gcr.io/kops/dns-controller:1.23.0-beta.
2
name: dns-controller
name: dns-controller
resources:
resources:
requests:
requests:
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+
3
-
3
View file @
0b4e236a
...
@@ -23,7 +23,7 @@ metadata:
...
@@ -23,7 +23,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
k8s-app: kops-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
name: kops-controller
name: kops-controller
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -37,7 +37,7 @@ spec:
...
@@ -37,7 +37,7 @@ spec:
labels:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
k8s-app: kops-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
spec:
spec:
containers:
containers:
- command:
- command:
...
@@ -47,7 +47,7 @@ spec:
...
@@ -47,7 +47,7 @@ spec:
env:
env:
- name: KUBERNETES_SERVICE_HOST
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.23.0-beta.
1
image: k8s.gcr.io/kops/kops-controller:1.23.0-beta.
2
name: kops-controller
name: kops-controller
resources:
resources:
requests:
requests:
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content
+
2
-
2
View file @
0b4e236a
...
@@ -6,7 +6,7 @@ spec:
...
@@ -6,7 +6,7 @@ spec:
addons:
addons:
- id: k8s-1.16
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash:
da54ceb5a6af39d8b6a69a20f09b5428b0b1c6c0c26b108c1afb7d4b2bcb4597
manifestHash:
3dffa4329c19c62cd4996ff145980922e077b7c28e40e840e6d44cc0495bb9c5
name: kops-controller.addons.k8s.io
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
needsRollingUpdate: control-plane
selector:
selector:
...
@@ -40,7 +40,7 @@ spec:
...
@@ -40,7 +40,7 @@ spec:
version: 9.99.0
version: 9.99.0
- id: k8s-1.12
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash:
b9d699d9356b4da68e3c50574667faa2750f182ee53b4dd7b9432574d0b04fdb
manifestHash:
c4f494b2e520dac2bfb69dd5e31b7e7d7f0885b961f47d1a8e5a21acdcaee552
name: dns-controller.addons.k8s.io
name: dns-controller.addons.k8s.io
selector:
selector:
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+
3
-
3
View file @
0b4e236a
...
@@ -7,7 +7,7 @@ metadata:
...
@@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
k8s-app: dns-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
name: dns-controller
name: dns-controller
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -24,7 +24,7 @@ spec:
...
@@ -24,7 +24,7 @@ spec:
labels:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
k8s-app: dns-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
spec:
spec:
containers:
containers:
- command:
- command:
...
@@ -38,7 +38,7 @@ spec:
...
@@ -38,7 +38,7 @@ spec:
env:
env:
- name: KUBERNETES_SERVICE_HOST
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.23.0-beta.
1
image: k8s.gcr.io/kops/dns-controller:1.23.0-beta.
2
name: dns-controller
name: dns-controller
resources:
resources:
requests:
requests:
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+
3
-
3
View file @
0b4e236a
...
@@ -23,7 +23,7 @@ metadata:
...
@@ -23,7 +23,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
k8s-app: kops-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
name: kops-controller
name: kops-controller
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -37,7 +37,7 @@ spec:
...
@@ -37,7 +37,7 @@ spec:
labels:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
k8s-app: kops-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
spec:
spec:
containers:
containers:
- command:
- command:
...
@@ -47,7 +47,7 @@ spec:
...
@@ -47,7 +47,7 @@ spec:
env:
env:
- name: KUBERNETES_SERVICE_HOST
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.23.0-beta.
1
image: k8s.gcr.io/kops/kops-controller:1.23.0-beta.
2
name: kops-controller
name: kops-controller
resources:
resources:
requests:
requests:
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content
+
1
-
1
View file @
0b4e236a
...
@@ -10,7 +10,7 @@ spec:
...
@@ -10,7 +10,7 @@ spec:
- --client-key=/secrets/client.key
- --client-key=/secrets/client.key
command:
command:
- /kube-apiserver-healthcheck
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
2
livenessProbe:
livenessProbe:
httpGet:
httpGet:
host: 127.0.0.1
host: 127.0.0.1
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-bootstrap_content
+
2
-
2
View file @
0b4e236a
...
@@ -6,7 +6,7 @@ spec:
...
@@ -6,7 +6,7 @@ spec:
addons:
addons:
- id: k8s-1.16
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash:
f15c2eb1247a7646c4879b7622523a3bb2897ac0da77b9af0f215096b51feb51
manifestHash:
0a7c4c7b3c37bbfe38aea686e93c9206460c98b20f70bc311d072f052ebac889
name: kops-controller.addons.k8s.io
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
needsRollingUpdate: control-plane
selector:
selector:
...
@@ -40,7 +40,7 @@ spec:
...
@@ -40,7 +40,7 @@ spec:
version: 9.99.0
version: 9.99.0
- id: k8s-1.12
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash:
b9d699d9356b4da68e3c50574667faa2750f182ee53b4dd7b9432574d0b04fdb
manifestHash:
c4f494b2e520dac2bfb69dd5e31b7e7d7f0885b961f47d1a8e5a21acdcaee552
name: dns-controller.addons.k8s.io
name: dns-controller.addons.k8s.io
selector:
selector:
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
+
3
-
3
View file @
0b4e236a
...
@@ -7,7 +7,7 @@ metadata:
...
@@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
k8s-app: dns-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
name: dns-controller
name: dns-controller
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -24,7 +24,7 @@ spec:
...
@@ -24,7 +24,7 @@ spec:
labels:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
k8s-app: dns-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
spec:
spec:
containers:
containers:
- command:
- command:
...
@@ -38,7 +38,7 @@ spec:
...
@@ -38,7 +38,7 @@ spec:
env:
env:
- name: KUBERNETES_SERVICE_HOST
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.23.0-beta.
1
image: k8s.gcr.io/kops/dns-controller:1.23.0-beta.
2
name: dns-controller
name: dns-controller
resources:
resources:
requests:
requests:
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
+
3
-
3
View file @
0b4e236a
...
@@ -23,7 +23,7 @@ metadata:
...
@@ -23,7 +23,7 @@ metadata:
app.kubernetes.io/managed-by: kops
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
k8s-app: kops-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
name: kops-controller
name: kops-controller
namespace: kube-system
namespace: kube-system
spec:
spec:
...
@@ -37,7 +37,7 @@ spec:
...
@@ -37,7 +37,7 @@ spec:
labels:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
k8s-app: kops-controller
version: v1.23.0-beta.
1
version: v1.23.0-beta.
2
spec:
spec:
containers:
containers:
- command:
- command:
...
@@ -47,7 +47,7 @@ spec:
...
@@ -47,7 +47,7 @@ spec:
env:
env:
- name: KUBERNETES_SERVICE_HOST
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.23.0-beta.
1
image: k8s.gcr.io/kops/kops-controller:1.23.0-beta.
2
name: kops-controller
name: kops-controller
resources:
resources:
requests:
requests:
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content
+
1
-
1
View file @
0b4e236a
...
@@ -10,7 +10,7 @@ spec:
...
@@ -10,7 +10,7 @@ spec:
- --client-key=/secrets/client.key
- --client-key=/secrets/client.key
command:
command:
- /kube-apiserver-healthcheck
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.23.0-beta.
2
livenessProbe:
livenessProbe:
httpGet:
httpGet:
host: 127.0.0.1
host: 127.0.0.1
...
...
This diff is collapsed.
Click to expand it.
tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-bootstrap_content
+
2
-
2
View file @
0b4e236a
...
@@ -6,7 +6,7 @@ spec:
...
@@ -6,7 +6,7 @@ spec:
addons:
addons:
- id: k8s-1.16
- id: k8s-1.16
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash:
1838bc5f1705bab68183edd8a21e5280d5e660778a60a39001755441ddc2a7ba
manifestHash:
b2779706d084f6c7e8bb15bda0ea23b793b4fceb17aa98e3bc9971584558d4af
name: kops-controller.addons.k8s.io
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
needsRollingUpdate: control-plane
selector:
selector:
...
@@ -40,7 +40,7 @@ spec:
...
@@ -40,7 +40,7 @@ spec:
version: 9.99.0
version: 9.99.0
- id: k8s-1.12
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash:
b9d699d9356b4da68e3c50574667faa2750f182ee53b4dd7b9432574d0b04fdb
manifestHash:
c4f494b2e520dac2bfb69dd5e31b7e7d7f0885b961f47d1a8e5a21acdcaee552
name: dns-controller.addons.k8s.io
name: dns-controller.addons.k8s.io
selector:
selector:
k8s-addon: dns-controller.addons.k8s.io
k8s-addon: dns-controller.addons.k8s.io
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
5
…
12
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help