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

dev to stable #7516

Merged
merged 14 commits into from
May 15, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
hostNetwork: true
containers:
- name: kube-aws-iam-controller
image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-2-g5f9bcc0
image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-4-g21debb6
args:
- --debug
- "--assume-role={{.Cluster.LocalID}}-worker"
Expand Down
4 changes: 4 additions & 0 deletions cluster/manifests/deletions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -287,3 +287,7 @@ post_apply:
- name: skipper-ingress
kind: ClusterRoleBinding
namespace: kube-system

- name: prometheus
kind: Ingress
namespace: kube-system
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,12 @@ spec:
port:
name: http
pathType: ImplementationSpecific
- host: "deployment-status-service-{{.Cluster.Alias}}.{{.Values.hosted_zone}}"
http:
paths:
- backend:
service:
name: "deployment-service-status-service"
port:
name: http
pathType: ImplementationSpecific
2 changes: 1 addition & 1 deletion cluster/manifests/event-logger/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
serviceAccountName: kubernetes-event-logger
containers:
- name: logger
image: container-registry.zalando.net/teapot/event-logger:master-12
image: container-registry.zalando.net/teapot/event-logger:master-13
args:
- --snapshot-namespace=kube-system
- --snapshot-name=kubernetes-event-logger
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/kube-metrics-adapter/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
serviceAccountName: custom-metrics-apiserver
containers:
- name: kube-metrics-adapter
image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.2-35-gdcedc0c
image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.2-46-gf55afc0
env:
- name: AWS_REGION
value: {{ .Cluster.Region }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
effect: NoSchedule
containers:
- name: controller
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-24
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-25
resources:
requests:
cpu: {{.Cluster.ConfigItems.kube_node_ready_controller_cpu}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
serviceAccountName: kubernetes-lifecycle-metrics
containers:
- name: kubernetes-lifecycle-metrics
image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-17"
image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-18"
ports:
- containerPort: 9090
protocol: TCP
Expand Down
26 changes: 1 addition & 25 deletions cluster/manifests/prometheus/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
# TODO: Remove
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: prometheus
namespace: kube-system
annotations:
zalando.org/skipper-filter: |
oauthTokeninfoAnyKV("realm", "/employees", "realm", "/services")
labels:
application: kubernetes
component: prometheus
spec:
rules:
- host: system-prometheus.{{ .Values.hosted_zone }}
http:
paths:
- backend:
service:
name: prometheus
port:
number: 80
pathType: ImplementationSpecific
---
apiVersion: zalando.org/v1
kind: RouteGroup
metadata:
Expand All @@ -43,7 +19,7 @@ spec:
routes:
- pathSubtree: /
predicates:
- HeaderRegexp("Authorization", "Bearer .+")
- HeaderRegexp("Authorization", "^Bearer .+")
filters:
- oauthTokeninfoAnyKV("realm", "/employees", "realm", "/services")

Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/skipper/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ $internal_version := "v0.21.86-915" }}
{{ $canary_internal_version := "v0.21.86-915" }}
{{ $canary_internal_version := "v0.21.91-921" }}

{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
{{ $canary_args := "" }}
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/master-default/userdata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ write_files:
- mountPath: /etc/kubernetes/ssl
name: ssl-certs-kubernetes
readOnly: true
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-132
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-133
name: webhook
ports:
- containerPort: 8081
Expand Down