Skip to content

Commit

Permalink
Merge pull request #8462 from zalando-incubator/alpha-to-beta
Browse files Browse the repository at this point in the history
alpha to beta
  • Loading branch information
katyanna authored Oct 29, 2024
2 parents ce8f794 + 170f2ad commit 780f7b5
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 8 deletions.
5 changes: 4 additions & 1 deletion cluster/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Resources:
Subnets:
{{ with $values := .Values }}
{{ range $az := $values.availability_zones }}
- "{{ index $values.subnets $az }}"
- "{{ index $values.lb_subnets $az }}"
{{ end }}
{{ end }}
Tags:
Expand Down Expand Up @@ -1767,6 +1767,9 @@ Resources:
- Action: 'kinesis:Describe*'
Effect: Allow
Resource: '*'
- Action: 'kinesisanalytics:List*'
Effect: Allow
Resource: '*'
- Action: 'lambda:List*'
Effect: Allow
Resource: '*'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
hostNetwork: true
containers:
- name: kube-aws-iam-controller
image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-43-gf1c8bd8
image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-45-gf22c994
env:
- name: AWS_DEFAULT_REGION
value: "{{.Cluster.Region}}"
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.1-master-131
image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.31.1-master-132
name: aws-cloud-controller-manager
resources:
requests:
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-226"
image: "container-registry.zalando.net/teapot/deployment-controller:master-229"
args:
- "--config-namespace=kube-system"
- "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccount | getAWSAccountID }}:alias/deployment-secret"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {{ $image := "container-registry.zalando.net/teapot/deployment-status-service:master-226" }}
# {{ $image := "container-registry.zalando.net/teapot/deployment-status-service:master-229" }}
# {{ $version := index (split $image ":") 1 }}

apiVersion: apps/v1
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 @@ -57,7 +57,7 @@ spec:
failureThreshold: 30
periodSeconds: 10
- name: kube-flannel
image: container-registry.zalando.net/teapot/flannel:v0.25.7-master-30
image: container-registry.zalando.net/teapot/flannel:v0.26.0-master-31
command:
- /opt/bin/flanneld
args:
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/kube-metrics-adapter/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
serviceAccountName: custom-metrics-apiserver
containers:
- name: kube-metrics-adapter
image: container-registry.zalando.net/teapot/kube-metrics-adapter:kube-metrics-adapter-0.2.3-30-g68fcf9b
image: container-registry.zalando.net/teapot/kube-metrics-adapter:kube-metrics-adapter-0.2.3-31-g9ff49a9
env:
- name: AWS_REGION
value: {{ .Cluster.Region }}
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/kubenurse/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
value: "1"
containers:
- name: prometheus
image: container-registry.zalando.net/teapot/prometheus:v2.54.1-master-58
image: container-registry.zalando.net/teapot/prometheus:v2.55.0-master-59
args:
- "--config.file=/etc/prometheus/prometheus.yml"
- "--storage.tsdb.path=/prometheus/"
Expand Down

0 comments on commit 780f7b5

Please sign in to comment.