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.

Sign up for GitHub

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

Jump to bottom

alpha to beta #6648

Merged
merged 8 commits into from
Dec 14, 2023
Merged

alpha to beta #6648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5996419
Add support for scaling on Nakadi metrics
mikkeloscar Nov 17, 2023
d9494f8
ingress-controller: add application stack tag
AlexanderYastrebov Dec 12, 2023
6e24728
Merge pull request #6584 from zalando-incubator/nakadi-based-scaling
myaser Dec 12, 2023
354ea60
Merge dev to dev-to-alpha
zalando-teapot-robot Dec 13, 2023
66035e1
Merge pull request #6643 from zalando-incubator/ingress-controller/ad…
AlexanderYastrebov Dec 13, 2023
1e8e7e6
Merge dev to dev-to-alpha
zalando-teapot-robot Dec 13, 2023
5f94450
Merge pull request #6646 from zalando-incubator/dev-to-alpha
gargravarr Dec 13, 2023
0a6daa4
Merge alpha to alpha-to-beta
zalando-teapot-robot Dec 13, 2023
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
2 changes: 2 additions & 0 deletions cluster/config-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,8 @@ kube_metrics_adapter_default_scaling_window: "10m"
kube_metrics_adapter_scaling_schedule_ramp_steps: "5"
## ZMON KairosDB URL
zmon_kairosdb_url: "https://data-service.zmon.zalan.do/kairosdb-proxy"
## Nakadi URL (for the stats API)
nakadi_url: ""

# skipper east-west feature - deprecated configuration
# enable_skipper_eastwest is the legacy feature gate for the automatic
Expand Down
3 changes: 2 additions & 1 deletion cluster/manifests/ingress-controller/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ spec:
# {{ end }}
- --cluster-local-domain=cluster.local
- --deny-internal-domains
- "--additional-stack-tags=InfrastructureComponent=true"
- --additional-stack-tags=InfrastructureComponent=true
- --additional-stack-tags=application=kube-ingress-aws-controller
# {{ if or (eq .Cluster.ConfigItems.nlb_switch "pre") (eq .Cluster.ConfigItems.nlb_switch "exec") }}
- --nlb-http-enabled
- --nlb-http-target-port=9998
Expand Down
10 changes: 8 additions & 2 deletions cluster/manifests/kube-metrics-adapter/credentials.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if eq .Environment "production" }}
{{- if or (eq .Environment "production") (ne .Cluster.ConfigItems.nakadi_url "") }}
apiVersion: zalando.org/v1
kind: PlatformCredentialsSet
metadata:
Expand All @@ -10,6 +10,12 @@ metadata:
spec:
application: kubernetes
tokens:
{{- if and (eq .Environment "production") (ne .Cluster.ConfigItems.zmon_kairosdb_url "") }}
zmon:
privileges: []
{{ end }}
{{- end }}
{{- if ne .Cluster.ConfigItems.nakadi_url ""}}
nakadi:
privileges: []
{{- end }}
{{- end }}
13 changes: 8 additions & 5 deletions cluster/manifests/kube-metrics-adapter/deployment.yaml
View file
Open in desktop
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.1-18-g85f1c3e
image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.2
env:
- name: AWS_REGION
value: {{ .Region }}
Expand All @@ -46,12 +46,15 @@ spec:
{{ if eq .Environment "production" }}
- --zmon-kariosdb-endpoint={{.Cluster.ConfigItems.zmon_kairosdb_url}}
{{ end }}
{{- if ne .Cluster.ConfigItems.nakadi_url "" }}
- --nakadi-endpoint={{.Cluster.ConfigItems.nakadi_url}}
{{- end }}
volumeMounts:
{{ if eq .Environment "production" }}
{{- if or (eq .Environment "production") (ne .Cluster.ConfigItems.nakadi_url "") }}
- name: credentials
mountPath: /meta/credentials
readOnly: true
{{ end }}
{{- end }}
resources:
limits:
cpu: 10m
Expand All @@ -60,8 +63,8 @@ spec:
cpu: 10m
memory: 4Gi
volumes:
{{ if eq .Environment "production" }}
{{- if or (eq .Environment "production") (ne .Cluster.ConfigItems.nakadi_url "") }}
- name: credentials
secret:
secretName: "kube-metrics-adapter"
{{ end }}
{{- end }}