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 eks #8170

Merged
merged 16 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
28 changes: 2 additions & 26 deletions cluster/manifests/deletions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -305,34 +305,10 @@ post_apply:
namespace: kube-system

{{ if ne .Cluster.ConfigItems.k8s_dashboard_enabled "true" }}
- name: kubernetes-dashboard
namespace: kube-system
kind: Deployment
- name: kubernetes-dashboard
namespace: kube-system
kind: Service
- name: dashboard-metrics-scraper
namespace: kube-system
kind: Service
- name: dashboard-metrics-scraper
namespace: kube-system
kind: Deployment
- name: kubernetes-dashboard
namespace: kube-system
- name: readonly-dashboard
kind: Role
- name: kubernetes-dashboard
namespace: kube-system
- name: readonly-dashboard
kind: RoleBinding
- name: kubernetes-dashboard
kind: ClusterRole
- name: kubernetes-dashboard-internal
kind: ClusterRoleBinding
- name: kubernetes-dashboard-readonly
kind: ClusterRoleBinding
- name: dashboard-metrics-scraper-vpa
namespace: kube-system
kind: VerticalPodAutoscaler
- name: kubernetes-dashboard
namespace: kube-system
kind: ServiceAccount
{{ end }}
2 changes: 1 addition & 1 deletion cluster/manifests/metrics-server/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
serviceAccountName: metrics-server
containers:
- name: metrics-server
image: container-registry.zalando.net/teapot/metrics-server:v0.7.0-master-16
image: container-registry.zalando.net/teapot/metrics-server:v0.7.2-master-18
args:
- --cert-dir=/tmp
- --secure-port=4443
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/nvidia/nvidia-gpu-device-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
{{- end}}
containers:
- name: nvidia-gpu-device-plugin
image: container-registry.zalando.net/teapot/nvidia-gpu-device-plugin:v0.16.0-master-13
image: container-registry.zalando.net/teapot/nvidia-gpu-device-plugin:v0.16.2-master-14
args:
- --fail-on-init-error=false
- --pass-device-specs
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/prometheus/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
mountPath: /prometheus
containers:
- name: prometheus
image: container-registry.zalando.net/teapot/prometheus:v2.53.1-master-56
image: container-registry.zalando.net/teapot/prometheus:v2.53.1-master-57
args:
- "--config.file=/prometheus/prometheus.yaml"
- "--storage.tsdb.path=/prometheus/"
Expand Down
2 changes: 2 additions & 0 deletions cluster/manifests/roles/readonly-binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ subjects:
- kind: Group
name: "okta:common/read-only"
apiGroup: rbac.authorization.k8s.io
{{ if ne .Cluster.ConfigItems.k8s_dashboard_enabled "true" }}
---
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -42,6 +43,7 @@ subjects:
- kind: Group
name: "okta:common/read-only"
apiGroup: rbac.authorization.k8s.io
{{ end }}
---
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
Expand Down
2 changes: 2 additions & 0 deletions cluster/manifests/roles/readonly-dashboard.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ if ne .Cluster.ConfigItems.k8s_dashboard_enabled "true" }}
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
Expand All @@ -8,3 +9,4 @@ rules:
resources: [ "services/proxy" ]
verbs: [ "get" ]
resourceNames: [ "kubernetes-dashboard" ]
{{ end }}
16 changes: 15 additions & 1 deletion cluster/manifests/skipper-canary-controller/canary-cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,27 @@ spec:
containers:
- name: skipper-canary-controller
terminationMessagePolicy: FallbackToLogsOnError
image: container-registry.zalando.net/gwproxy/skipper-canary-controller:main-20
image: container-registry.zalando.net/gwproxy/skipper-canary-controller:main-21
env:
- name: _PLATFORM_OBSERVABILITY_ACCESS_TOKEN
valueFrom:
secretKeyRef:
name: skipper-ingress
key: lightstep-token
- name: _PLATFORM_OBSERVABILITY_COLLECTOR_SCHEME
value: "{{ .Cluster.ConfigItems.observability_collector_scheme }}"
- name: _PLATFORM_OBSERVABILITY_COLLECTOR_PORT
value: "{{ .Cluster.ConfigItems.observability_collector_port }}"
- name: _PLATFORM_OBSERVABILITY_COLLECTOR_ENDPOINT
value: "{{ .Cluster.ConfigItems.observability_collector_endpoint }}"
- name: _PLATFORM_OBSERVABILITY_METRICS_ENDPOINT
value: "{{ .Cluster.ConfigItems.observability_metrics_endpoint }}"
- name: _PLATFORM_OBSERVABILITY_METRICS_PORT
value: "{{ .Cluster.ConfigItems.observability_metrics_port }}"
- name: _PLATFORM_ACCOUNT
value: "{{ .Cluster.Alias }}"
- name: _PLATFORM_OBSERVABILITY_COMMON_ATTRIBUTE_CLOUD__ACCOUNT__ID
value: "{{ .Cluster.Alias }}"
- name: LIGHTSTEP_DEBUG
value: "true"
args:
Expand Down