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

alpha to beta #5848

Merged
merged 18 commits into from
Mar 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
879a2d5
deploy CSI-related components by default
linki Dec 7, 2022
a7944fc
added option to redefine set of labels provided by kube-state-metrics…
Mar 14, 2023
732db3e
Merge pull request #5832 from kostz/ksm-whitelist-additional-labels
kostz Mar 15, 2023
60c7bd6
Merge branch 'dev' into ksm-whitelist-additional-labels
kostz Mar 15, 2023
87eb7bb
Merge pull request #5835 from zalando-incubator/ksm-whitelist-additio…
gargravarr Mar 16, 2023
a5896b9
Merge dev to dev-to-alpha
zalando-teapot-robot Mar 16, 2023
5fc532a
Update to latest tokeninfo image
mikkeloscar Mar 16, 2023
7d45419
Merge pull request #5843 from zalando-incubator/update-tokeninfo
mikkeloscar Mar 16, 2023
2e3dcb5
Merge dev to dev-to-alpha
zalando-teapot-robot Mar 16, 2023
851ce37
Merge pull request #5570 from zalando-incubator/ebs-csi-on-by-default
linki Mar 16, 2023
f175f3f
Merge dev to dev-to-alpha
zalando-teapot-robot Mar 16, 2023
7d8becd
update deployment-service to correctly log namespace for cloudformation
linki Mar 20, 2023
0cfe24b
Merge pull request #5842 from zalando-incubator/dev-to-alpha
gargravarr Mar 21, 2023
e70aaa8
Merge alpha to alpha-to-beta
zalando-teapot-robot Mar 21, 2023
853568d
Merge pull request #5847 from zalando-incubator/deployment-service-up…
gargravarr Mar 21, 2023
8a930fd
Merge dev to dev-to-alpha
zalando-teapot-robot Mar 21, 2023
2f9a988
Merge pull request #5849 from zalando-incubator/dev-to-alpha
mikkeloscar Mar 21, 2023
ef102ee
Merge alpha to alpha-to-beta
zalando-teapot-robot Mar 21, 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
6 changes: 5 additions & 1 deletion cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ cpu_manager_policy: "none"
allowed_unsafe_sysctls: "net.ipv4.tcp_keepalive_time,net.ipv4.tcp_keepalive_intvl,net.ipv4.tcp_keepalive_probes,net.ipv4.tcp_syn_retries,net.ipv4.tcp_retries2"

# enable CSI Driver feature flag
enable_csi: "false"
enable_csi: "true"
# enable CSIMigration and CSIMigrationAWS feature flags (make sure to set `enable_csi: true` for this to work)
enable_csi_migration: "false"
# the maximum amount of memory for EBS CSI controller's sidecars
Expand Down Expand Up @@ -804,6 +804,10 @@ observability_collector_scheme: "https"
observability_metrics_endpoint: "ingest.lightstep.com"
observability_metrics_port: "443"

# labels whitelisted to kube-state-metrics
observability_metrics_pods_labels: "application,component"
observability_metrics_ingresses_labels: ""

# opentelemetry collector
observability_otel_collector_enabled: "false"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
terminationGracePeriodSeconds: 300
containers:
- name: "deployment-service-controller"
image: "container-registry.zalando.net/teapot/deployment-controller:master-115"
image: "container-registry.zalando.net/teapot/deployment-controller:master-118"
args:
- "--config-namespace=kube-system"
env:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ $image := "container-registry.zalando.net/teapot/deployment-status-service" }}
{{ $version := "master-115" }}
{{ $version := "master-118" }}

apiVersion: apps/v1
kind: Deployment
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/kube-state-metrics/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
image: container-registry.zalando.net/teapot/kube-state-metrics:v2.2.1-master-21
args:
- --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments,verticalpodautoscalers
- --metric-labels-allowlist=pods=[application,component],nodes=[topology.kubernetes.io/zone,node.kubernetes.io/instance-type,node.kubernetes.io/node-pool,node.kubernetes.io/role,dedicated]
- --metric-labels-allowlist=pods=[{{.Cluster.ConfigItems.observability_metrics_pods_labels}}],ingresses=[{{.Cluster.ConfigItems.observability_metrics_ingresses_labels}}],nodes=[topology.kubernetes.io/zone,node.kubernetes.io/instance-type,node.kubernetes.io/node-pool,node.kubernetes.io/role,dedicated]
ports:
- containerPort: 8080
name: http-metrics
Expand Down
4 changes: 2 additions & 2 deletions cluster/node-pools/master-default/userdata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ write_files:
- mountPath: /etc/kubernetes/config
name: kubernetes-configs
readOnly: true
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-19
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-55
name: tokeninfo
ports:
- containerPort: 9021
Expand Down Expand Up @@ -376,7 +376,7 @@ write_files:
value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }}
{{ if ne .Cluster.Environment "production" }}
- name: tokeninfo-sandbox
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-19
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-55
ports:
- containerPort: 9022
lifecycle:
Expand Down