Skip to content

Commit a095d53

Browse files
author
Vinay Thupili
committed
Merge branch 'dev' into vthupili-tmp
2 parents 61af3ca + 85add7a commit a095d53

File tree

2 files changed

+3
-87
lines changed

2 files changed

+3
-87
lines changed

cluster/manifests/wiz/005-connector-job.yaml

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -80,78 +80,5 @@ spec:
8080
memory: {{ .Cluster.ConfigItems.wiz_connector_memory }}
8181
requests:
8282
cpu: {{ .Cluster.ConfigItems.wiz_connector_cpu }}
83-
memory: {{ .Cluster.ConfigItems.wiz_connector_memory }}
84-
---
85-
# Source: wiz-kubernetes-integration/charts/wiz-kubernetes-connector/templates/job-delete-connector.yaml
86-
apiVersion: batch/v1
87-
kind: Job
88-
metadata:
89-
name: wiz-kubernetes-connector-delete-connector
90-
namespace: "wiz"
91-
labels:
92-
helm.sh/chart: wiz-broker-2.1.0
93-
application: "wiz"
94-
component: "connector"
95-
job: "wiz-connector-agent"
96-
spec:
97-
ttlSecondsAfterFinished: 60
98-
manualSelector: true
99-
selector:
100-
matchLabels:
101-
job: "wiz-connector-agent"
102-
backoffLimit: 1
103-
template:
104-
metadata:
105-
labels:
106-
helm.sh/chart: wiz-broker-2.1.0
107-
application: "wiz"
108-
component: "connector"
109-
job: "wiz-connector-agent"
110-
spec:
111-
serviceAccountName: wiz-auto-modify-connector
112-
restartPolicy: "Never"
113-
securityContext:
114-
runAsNonRoot: true
115-
runAsUser: 1000
116-
containers:
117-
- name: wiz-connector-delete
118-
securityContext:
119-
allowPrivilegeEscalation: false
120-
runAsNonRoot: true
121-
runAsUser: 1000
122-
image: "container-registry.zalando.net/secops-systems/wiz-broker:2.5-main-2"
123-
imagePullPolicy: IfNotPresent
124-
command: ["/bin/sh", "-c"]
125-
args:
126-
- >
127-
wiz-broker delete-kubernetes-connector
128-
--input-secrets-namespace
129-
"wiz"
130-
--input-secret-name
131-
"wiz-connector-connector"
132-
|| true
133-
env:
134-
- name: LOG_LEVEL
135-
value: info
136-
- name: WIZ_CLIENT_ID
137-
valueFrom:
138-
secretKeyRef:
139-
name: wiz-api-token
140-
key: clientId
141-
optional: false
142-
- name: WIZ_CLIENT_TOKEN
143-
valueFrom:
144-
secretKeyRef:
145-
name: wiz-api-token
146-
key: clientToken
147-
optional: false
148-
- name: WIZ_ENV
149-
value: ""
150-
resources:
151-
limits:
152-
cpu: {{ .Cluster.ConfigItems.wiz_connector_cpu }}
153-
memory: {{ .Cluster.ConfigItems.wiz_connector_memory }}
154-
requests:
155-
cpu: {{ .Cluster.ConfigItems.wiz_connector_cpu }}
156-
memory: {{ .Cluster.ConfigItems.wiz_connector_memory }}
83+
memory: {{ .Cluster.ConfigItems.wiz_connector_memory }}
15784
{{end}}

cluster/manifests/wiz/sensor-daemonset.yaml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,10 @@ spec:
3939
hostPID: true
4040
hostIPC: true
4141
tolerations:
42-
- key: karpenter.sh/disruption
42+
- effect: NoSchedule
4343
operator: Exists
44-
- key: node.kubernetes.io/not-ready
44+
- effect: NoExecute
4545
operator: Exists
46-
- key: aws.amazon.com/spot
47-
operator: Exists
48-
- key: zalando.org/node-not-ready
49-
operator: Exists
50-
effect: NoSchedule
51-
- key: nvidia.com/gpu
52-
value: present
53-
effect: NoSchedule
54-
- key: dedicated
55-
value: skipper-ingress
56-
effect: NoSchedule
5746
restartPolicy: Always
5847
containers:
5948
- name: wiz-sensor

0 commit comments

Comments
 (0)