Skip to content

Commit 440d7ee

Browse files
authored
Merge pull request #9568 from zalando-incubator/alpha-to-beta
alpha to beta
2 parents b5eb7ed + de1d5b6 commit 440d7ee

File tree

8 files changed

+8
-7
lines changed

8 files changed

+8
-7
lines changed

cluster/cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1677,7 +1677,7 @@ Resources:
16771677
DeploymentControllerMLExperimentDeploymentRole:
16781678
Type: AWS::IAM::Role
16791679
Properties:
1680-
RoleName: "{{.Cluster.LocalID}}-deployment-service-ml-experiment-deployment"
1680+
RoleName: "{{ .Cluster.ConfigItems.deployment_service_ml_experiments_role_name }}"
16811681
AssumeRolePolicyDocument:
16821682
Version: "2012-10-17"
16831683
Statement:

cluster/config-defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,7 @@ deployment_service_api_role_arn: ""
10401040
deployment_service_tokeninfo_url: ""
10411041
deployment_service_lightstep_token: ""
10421042
deployment_service_ml_experiments_enabled: "true"
1043+
deployment_service_ml_experiments_role_name: "{{ .Cluster.LocalID }}-deployment-service-ml-experiment-deployment"
10431044
deployment_service_cf_auto_expand_enabled: "false"
10441045
deployment_service_cf_update_source_branch_changes: "true"
10451046
deployment_service_executor_cdp_permissions: "false"

cluster/manifests/deployment-service/01-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ data:
4747
status-service-url-local: "http://deployment-status-service.ingress.cluster.local."
4848
deployment-role-arn: "arn:aws:iam::{{accountID .Cluster.InfrastructureAccount}}:role/{{.Cluster.LocalID}}-deployment-service-deployment"
4949
{{- if eq .Cluster.ConfigItems.deployment_service_ml_experiments_enabled "true"}}
50-
ml-experiment-deployment-role-arn: "arn:aws:iam::{{accountID .Cluster.InfrastructureAccount}}:role/{{.Cluster.LocalID}}-deployment-service-ml-experiment-deployment"
50+
ml-experiment-deployment-role-arn: "arn:aws:iam::{{accountID .Cluster.InfrastructureAccount}}:role/{{ .Cluster.ConfigItems.deployment_service_ml_experiments_role_name }}"
5151
{{- end }}
5252
cloudformation-enable-auto-expand: "{{.Cluster.ConfigItems.deployment_service_cf_auto_expand_enabled}}"
5353
cloudformation-update-source-branch-changes: "{{.Cluster.ConfigItems.deployment_service_cf_update_source_branch_changes}}"

cluster/manifests/kube2iam/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
effect: NoExecute
3939
hostNetwork: true
4040
containers:
41-
- image: container-registry.zalando.net/teapot/kube2iam:0.12.0-master-22.patched
41+
- image: container-registry.zalando.net/teapot/kube2iam:0.13.0-master-23.patched
4242
name: kube2iam
4343
args:
4444
- --auto-discover-base-arn

cluster/manifests/kubenurse/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
value: "{{.Cluster.ConfigItems.network_monitoring_check_neighborhood}}"
5858
- name: KUBENURSE_HISTOGRAM_BUCKETS
5959
value: 0.005,0.05,0.5,1,5,10
60-
image: "container-registry.zalando.net/teapot/kubenurse:v1.14.4-main-12.custom"
60+
image: "container-registry.zalando.net/teapot/kubenurse:v1.14.6-main-13.custom"
6161
resources:
6262
requests:
6363
cpu: "{{.Cluster.ConfigItems.network_monitoring_daemonset_cpu}}"

cluster/manifests/nvidia/nvidia-gpu-device-plugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
mountPath: /var/lib/kubelet/device-plugins
8080
{{- if eq .Cluster.ConfigItems.nvidia_dcgm_exporter_enabled "true" }}
8181
- name: dcgm-exporter
82-
image: container-registry.zalando.net/teapot/nvidia-dcgm-exporter:v4.2.0-4.1.0-ubuntu22.04-master-19
82+
image: container-registry.zalando.net/teapot/nvidia-dcgm-exporter:v4.2.3-4.1.3-ubuntu22.04-master-20
8383
args:
8484
- --kubernetes
8585
- --address=:9400

cluster/manifests/pdb-controller/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccountName: pdb-controller
2828
containers:
2929
- name: pdb-controller
30-
image: container-registry.zalando.net/teapot/pdb-controller:master-36
30+
image: container-registry.zalando.net/teapot/pdb-controller:master-37
3131
args:
3232
- --debug
3333
{{- if .Cluster.ConfigItems.pdb_controller_non_ready_ttl }}

cluster/manifests/s3-csi-driver/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ spec:
114114
- args:
115115
- --csi-address=/csi/csi.sock
116116
- --health-port=9810
117-
image: container-registry.zalando.net/teapot/livenessprobe:v2.14.0-eks-1-31-10-master-29
117+
image: container-registry.zalando.net/teapot/livenessprobe:v2.15.0-eks-1-32-14-master-30
118118
imagePullPolicy: IfNotPresent
119119
name: liveness-probe
120120
resources:

0 commit comments

Comments
 (0)