Skip to content

Commit c3a3e55

Browse files
authored
Merge pull request #9786 from zalando-incubator/alpha-to-beta
alpha to beta
2 parents a019eba + ffff3d1 commit c3a3e55

File tree

10 files changed

+242
-3
lines changed

10 files changed

+242
-3
lines changed

cluster/cluster.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@ Resources:
158158
Type: 'AWS::EC2::SecurityGroup'
159159
EKSCluster:
160160
Type: AWS::EKS::Cluster
161+
{{- if eq .Cluster.ConfigItems.eks_control_plane_logging "true" }}
162+
{{- if eq .Cluster.ConfigItems.eks_control_plane_logging_migration "true" }}
163+
DependsOn: ControlPlaneLogGroup
164+
{{- end }}
165+
{{- end }}
161166
Properties:
162167
Name: "{{.Cluster.Name}}"
163168
Version: "1.32"
@@ -1535,6 +1540,9 @@ Resources:
15351540
- !Sub "arn:aws:iam::${AWS::AccountId}:policy/ZalandoCloud-DenyDefault"
15361541
- !Sub "arn:aws:iam::${AWS::AccountId}:policy/ZalandoCloud-AllowPowerUser"
15371542
- !Sub "arn:aws:iam::${AWS::AccountId}:policy/ZalandoCloud-AllowPowerUserCustom"
1543+
{{- if eq .Cluster.Name "playground" }}
1544+
- !Sub "arn:aws:iam::${AWS::AccountId}:policy/ZalandoCloud-AllowPowerUser-Playground"
1545+
{{- end }}
15381546
RoleName: "{{.Cluster.LocalID}}-deployment"
15391547
Type: 'AWS::IAM::Role'
15401548
DeploymentServiceBucket:
@@ -1686,6 +1694,9 @@ Resources:
16861694
- !Sub "arn:aws:iam::${AWS::AccountId}:policy/ZalandoCloud-DenyDefault"
16871695
- !Sub "arn:aws:iam::${AWS::AccountId}:policy/ZalandoCloud-AllowPowerUser"
16881696
- !Sub "arn:aws:iam::${AWS::AccountId}:policy/ZalandoCloud-AllowPowerUserCustom"
1697+
{{- if eq .Cluster.Name "playground" }}
1698+
- !Sub "arn:aws:iam::${AWS::AccountId}:policy/ZalandoCloud-AllowPowerUser-Playground"
1699+
{{- end }}
16891700
{{- if eq .Cluster.ConfigItems.deployment_service_ml_experiments_enabled "true"}}
16901701
DeploymentControllerMLExperimentDeploymentRole:
16911702
Type: AWS::IAM::Role
@@ -3023,6 +3034,16 @@ Resources:
30233034
- BucketArn: !GetAtt AuditTrailBucket.Arn
30243035
{{- end }}
30253036

3037+
{{- if eq .Cluster.ConfigItems.eks_control_plane_logging "true" }}
3038+
{{- if eq .Cluster.ConfigItems.eks_control_plane_logging_migration "true" }}
3039+
ControlPlaneLogGroup:
3040+
Type: AWS::Logs::LogGroup
3041+
Properties:
3042+
LogGroupName: "/aws/eks/{{.Cluster.LocalID}}/cluster"
3043+
RetentionInDays: 545
3044+
{{- end }}
3045+
{{- end }}
3046+
30263047
{{- if index .Cluster.ConfigItems "session_manager_destination_arn" }}
30273048
SessionManagerLogGroup:
30283049
Type: AWS::Logs::LogGroup

cluster/config-defaults.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,12 @@ skipper_pod_deletion_cost_controller_poll_timeout: "60s"
258258
skipper_pod_deletion_cost_controller_resync_enable: "true"
259259
skipper_pod_deletion_cost_controller_resync_interval: "1h"
260260

261-
# polarsignals - only enabled for testing teapot
261+
# polarsignals - only enabled for some clusters
262+
# right now only installed on skipper-ingress nodes
262263
polarsignals_enabled: "false"
264+
polarsignals_apikey: ""
265+
polarsignals_memory: 200Mi
266+
polarsignals_cpu: 50m
263267

264268
# Kube-Metrics-Adapter
265269
## Scheduled scaling metrics: ramp up/down over this period of time
@@ -1283,6 +1287,7 @@ wiz_node_feature_rollout : "false"
12831287

12841288
# EKS specific configuration
12851289
eks_control_plane_logging: "true"
1290+
eks_control_plane_logging_migration: "false"
12861291
eks_ip_family: "ipv4"
12871292
eks_zalando_iam_aws_proxy_cpu: "100m"
12881293
eks_zalando_iam_aws_proxy_memory: "512Mi"

cluster/manifests/02-admission-control/config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ data:
125125
{{- if eq .Cluster.ConfigItems.wiz_enable_runtime_sensor "true" }}
126126
pod.pod-security-policy.privileged-service-accounts.wiz_wiz-sensor: ""
127127
{{- end }}
128+
{{- if eq .Cluster.ConfigItems.polarsignals_enabled "true" }}
129+
pod.pod-security-policy.privileged-service-accounts.polarsignals_polarsignals-agent: ""
130+
{{- end }}
128131

129132
pod.pod-security-policy.allowed-restricted-capabilities.AUDIT_WRITE: ""
130133
pod.pod-security-policy.allowed-restricted-capabilities.CHOWN: ""

cluster/manifests/deletions.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,23 @@ post_apply:
3030
namespace: cron
3131
kind: LimitRange
3232
{{ end }}
33+
{{ if ne .Cluster.ConfigItems.polarsignals_enabled "true" }}
34+
- name: polarsignals
35+
namespace: polarsignals
36+
kind: Secret
37+
- name: polarsignals-agent
38+
namespace: polarsignals
39+
kind: DaemonSet
40+
- name: polarsignals-agent
41+
namespace: polarsignals
42+
kind: ServiceAccount
43+
- name: polarsignals-agent
44+
kind: ClusterRole
45+
- name: polarsignals-agent
46+
kind: ClusterRoleBinding
47+
- name: polarsignals
48+
kind: Namespace
49+
{{ end }}
3350
{{ if ne .Cluster.ConfigItems.downscaler_enabled "true" }}
3451
- name: kube-downscaler
3552
namespace: kube-system

cluster/manifests/ingress-controller/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{ $image := "926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-ingress-aws-controller:v0.18.7" }}
1+
# {{ $image := "926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-ingress-aws-controller:v0.18.8" }}
22
# {{ $version := index (split $image ":") 1 }}
33

44
apiVersion: apps/v1
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ if eq .Cluster.ConfigItems.polarsignals_enabled "true" }}
2+
---
3+
apiVersion: v1
4+
kind: Namespace
5+
metadata:
6+
labels:
7+
pod-security.kubernetes.io/audit: privileged
8+
pod-security.kubernetes.io/enforce: privileged
9+
pod-security.kubernetes.io/warn: privileged
10+
name: polarsignals
11+
{{ end }}
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{{ if eq .Cluster.ConfigItems.polarsignals_enabled "true" }}
2+
---
3+
apiVersion: v1
4+
kind: ServiceAccount
5+
metadata:
6+
labels:
7+
component: agent
8+
application: polarsignals
9+
name: polarsignals-agent
10+
namespace: polarsignals
11+
---
12+
apiVersion: rbac.authorization.k8s.io/v1
13+
kind: ClusterRole
14+
metadata:
15+
labels:
16+
component: agent
17+
application: polarsignals
18+
name: polarsignals-agent
19+
namespace: polarsignals
20+
rules:
21+
- apiGroups:
22+
- ""
23+
resources:
24+
- pods
25+
verbs:
26+
- list
27+
- watch
28+
- apiGroups:
29+
- ""
30+
resources:
31+
- nodes
32+
verbs:
33+
- get
34+
---
35+
apiVersion: rbac.authorization.k8s.io/v1
36+
kind: ClusterRoleBinding
37+
metadata:
38+
labels:
39+
component: agent
40+
application: polarsignals
41+
name: polarsignals-agent
42+
namespace: polarsignals
43+
roleRef:
44+
apiGroup: rbac.authorization.k8s.io
45+
kind: ClusterRole
46+
name: polarsignals-agent
47+
subjects:
48+
- kind: ServiceAccount
49+
name: polarsignals-agent
50+
namespace: polarsignals
51+
---
52+
{{ end }}
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
{{ if eq .Cluster.ConfigItems.polarsignals_enabled "true" }}
2+
---
3+
apiVersion: apps/v1
4+
kind: DaemonSet
5+
metadata:
6+
labels:
7+
component: agent
8+
application: polarsignals
9+
name: polarsignals-agent
10+
namespace: polarsignals
11+
annotations:
12+
node-ready.cluster.zalando.org/exclude: "true"
13+
spec:
14+
selector:
15+
matchLabels:
16+
component: agent
17+
application: polarsignals
18+
template:
19+
metadata:
20+
labels:
21+
component: agent
22+
application: polarsignals
23+
spec:
24+
containers:
25+
- args:
26+
- /bin/parca-agent
27+
- --log-level=info
28+
- --node=$(NODE_NAME)
29+
- --http-address=:7071
30+
- --remote-store-address=grpc.polarsignals.com:443
31+
- --remote-store-bearer-token-file=/var/polarsignals-agent/token
32+
- --debuginfo-strip
33+
- --debuginfo-temp-dir=/tmp
34+
- --debuginfo-upload-cache-duration=5m
35+
env:
36+
- name: NODE_NAME
37+
valueFrom:
38+
fieldRef:
39+
fieldPath: spec.nodeName
40+
image: container-registry.zalando.net/gwproxy/parca-agent:v0.41.0
41+
name: polarsignals-agent
42+
ports:
43+
- containerPort: 7071
44+
name: http
45+
readinessProbe:
46+
httpGet:
47+
path: /ready
48+
port: http
49+
resources:
50+
limits:
51+
cpu: "{{ .Cluster.ConfigItems.polarsignals_cpu}}"
52+
memory: "{{ .Cluster.ConfigItems.polarsignals_memory}}"
53+
requests:
54+
cpu: "{{ .Cluster.ConfigItems.polarsignals_cpu}}"
55+
memory: "{{ .Cluster.ConfigItems.polarsignals_memory}}"
56+
securityContext:
57+
privileged: true
58+
readOnlyRootFilesystem: true
59+
volumeMounts:
60+
- mountPath: /tmp
61+
name: tmp
62+
- mountPath: /run
63+
name: run
64+
- mountPath: /boot
65+
name: boot
66+
readOnly: true
67+
- mountPath: /lib/modules
68+
name: modules
69+
- mountPath: /sys/kernel/debug
70+
name: debugfs
71+
- mountPath: /sys/fs/cgroup
72+
name: cgroup
73+
- mountPath: /sys/fs/bpf
74+
name: bpffs
75+
- mountPath: /var/run/dbus/system_bus_socket
76+
name: dbus-system
77+
- mountPath: /var/polarsignals-agent
78+
name: token
79+
hostPID: true
80+
serviceAccountName: polarsignals-agent
81+
nodeSelector:
82+
kubernetes.io/os: linux
83+
dedicated: skipper-ingress
84+
tolerations:
85+
- effect: NoSchedule
86+
key: dedicated
87+
value: skipper-ingress
88+
- effect: NoExecute
89+
operator: Exists
90+
volumes:
91+
- emptyDir: {}
92+
name: tmp
93+
- hostPath:
94+
path: /run
95+
name: run
96+
- hostPath:
97+
path: /boot
98+
name: boot
99+
- hostPath:
100+
path: /sys/fs/cgroup
101+
name: cgroup
102+
- hostPath:
103+
path: /lib/modules
104+
name: modules
105+
- hostPath:
106+
path: /sys/fs/bpf
107+
name: bpffs
108+
- hostPath:
109+
path: /sys/kernel/debug
110+
name: debugfs
111+
- hostPath:
112+
path: /var/run/dbus/system_bus_socket
113+
name: dbus-system
114+
- secret:
115+
secretName: polarsignals-agent
116+
name: token
117+
{{ end }}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{ if eq .Cluster.ConfigItems.polarsignals_enabled "true" }}
2+
---
3+
apiVersion: v1
4+
kind: Secret
5+
metadata:
6+
name: polarsignals-agent
7+
namespace: polarsignals
8+
labels:
9+
component: agent
10+
application: polarsignals
11+
stringData:
12+
token: {{ .Cluster.ConfigItems.polarsignals_apikey }}
13+
{{ end }}

cluster/manifests/skipper/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{/* image-updater-bot detects *image variables so use print to disable it for main image */}}
22

33
{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.22.76-1183" }}
4-
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.22.76-1183" }}
4+
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.22.88-1195" }}
55

66
{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
77
{{ $canary_args := "" }}

0 commit comments

Comments
 (0)