Skip to content

Commit

Permalink
Merge pull request #8217 from zalando-incubator/alpha-to-beta
Browse files Browse the repository at this point in the history
alpha to beta
  • Loading branch information
mikkeloscar authored Sep 26, 2024
2 parents 81a6c09 + 7d9df41 commit d8039a7
Show file tree
Hide file tree
Showing 23 changed files with 42 additions and 428 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Features
* Kubernetes DNS with node-local dnsmasq as daemonset and CoreDNS resolver for cluster.local domain running in the same pod.
* Route53 DNS integration via `External DNS`_
* AWS IAM integration via kube2iam_, `AWS OIDC IAM`_
* Standard components are installed: dashboard, node exporter, kube-state-metrics, see also `cluster/manifests`_ directory
* Standard components are installed: node exporter, kube-state-metrics, see also `cluster/manifests`_ directory
* Webhook authentication and authorization (roles "ReadOnly", "PowerUser", "Manual", "Emergency", "Administrator")
* Emergency Access via internal emergency-access-service, that grant roles "Manual" and "Emergency" with 4 eyes principle and audit logging
* Log shipping via Scalyr
Expand Down
7 changes: 0 additions & 7 deletions cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -454,13 +454,6 @@ prometheus_remote_max_backoff: "10s"
# Comma-separated list of user ids allowed to access Prometheus UI
prometheus_ui_users: ""

# dashboard metrics scraper resource limits
dashboard_metrics_scraper_cpu_min: "50m"
dashboard_metrics_scraper_mem_min: "200Mi"

# config-item to toggle dashboard in a cluster
k8s_dashboard_enabled: "false"

metrics_service_cpu: "100m"
metrics_service_mem_max: "4Gi"
metrics_server_metric_resolution: "15s"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
- --cloud-provider=aws
- --use-service-account-credentials=true
- --configure-cloud-routes=false
image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.31.0-master-127
image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.31.0-master-128
name: aws-cloud-controller-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/cronjob-fixer/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
serviceAccountName: cronjob-fixer
containers:
- name: cronjob-fixer
image: "container-registry.zalando.net/teapot/cronjob-fixer:master-17"
image: "container-registry.zalando.net/teapot/cronjob-fixer:master-18"
resources:
limits:
cpu: 5m
Expand Down
117 changes: 0 additions & 117 deletions cluster/manifests/dashboard/deployment.yaml

This file was deleted.

111 changes: 0 additions & 111 deletions cluster/manifests/dashboard/rbac.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions cluster/manifests/dashboard/scraper-vpa.yaml

This file was deleted.

78 changes: 0 additions & 78 deletions cluster/manifests/dashboard/scraper.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions cluster/manifests/dashboard/service.yaml

This file was deleted.

Loading

0 comments on commit d8039a7

Please sign in to comment.