Skip to content

Commit

Permalink
Merge pull request #7884 from zalando-incubator/dev-to-eks
Browse files Browse the repository at this point in the history
dev to eks
  • Loading branch information
gargravarr authored Jul 22, 2024
2 parents d662864 + af4da7c commit fd8a5db
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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.30.2-master-124
image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.30.2-master-126
name: aws-cloud-controller-manager
resources:
requests:
Expand Down
6 changes: 6 additions & 0 deletions cluster/manifests/deployment-service/00-crd-cleanup-task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ spec:
status:
description: CDPResourceCleanupTaskStatus is the status part of the CDPResourceCleanupTask.
properties:
finishedAt:
description: |-
The timestamp when this resource cleanup task has finished.
The main purpose is to be able to determine age of finished tasks and clean them up.
format: date-time
type: string
phase:
default: Created
description: |-
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-220"
image: "container-registry.zalando.net/teapot/deployment-controller:master-222"
args:
- "--config-namespace=kube-system"
- "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccount | getAWSAccountID }}:alias/deployment-secret"
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/fabric-gateway/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {{ $version := "master-256" }}
# {{ $version := "master-263" }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
6 changes: 6 additions & 0 deletions cluster/manifests/fabric-gateway/fabricgateway_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,12 @@ spec:
The name of the StackSet resource in the same namespace which
should be handling requests coming through FabricGateway
type: string
stackVersion:
description: |-
EXPERIMENTAL: This field is experimental and may be removed in the future
Specifies stack version for this gateway
it should match stackset.spec.stackTemplate.spec.version field
type: string
required:
- hosts
- stackSetName
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/flannel/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
failureThreshold: 30
periodSeconds: 10
- name: kube-flannel
image: container-registry.zalando.net/teapot/flannel:v0.25.4-master-27
image: container-registry.zalando.net/teapot/flannel:v0.25.5-master-28
command:
- /opt/bin/flanneld
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: pause
image: container-registry.zalando.net/teapot/pause:3.4.1-master-18
image: container-registry.zalando.net/teapot/pause:3.7-master-21
resources:
limits:
cpu: {{$data.Cluster.ConfigItems.autoscaling_buffer_cpu}}
Expand Down
4 changes: 2 additions & 2 deletions 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.15.1-master-12
image: container-registry.zalando.net/teapot/nvidia-gpu-device-plugin:v0.16.0-master-13
args:
- --fail-on-init-error=false
- --pass-device-specs
Expand All @@ -80,7 +80,7 @@ spec:
mountPath: /var/lib/kubelet/device-plugins
{{- if eq .Cluster.ConfigItems.nvidia_dcgm_exporter_enabled "true" }}
- name: dcgm-exporter
image: container-registry.zalando.net/teapot/nvidia-dcgm-exporter:v3.3.6-3.4.2-ubuntu22.04-master-11
image: container-registry.zalando.net/teapot/nvidia-dcgm-exporter:v3.3.6-3.4.2-ubuntu22.04-master-12
args:
- --kubernetes
- --address=:9400
Expand Down

0 comments on commit fd8a5db

Please sign in to comment.