Skip to content

feat: remove service discovery components #835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthyx wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: remove service discovery components #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86cdc34
feat: remove service discovery components
matthyx May 8, 2026
e57b0f9
update kubescape image
matthyx May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions charts/kubescape-operator/templates/grype-offline-db/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ spec:
metadata:
annotations:
{{- include "kubescape-operator.annotations" (dict "Values" .Values) | nindent 12 }}
{{- with .Values.grypeOfflineDB.podAnnotations }}{{- toYaml . | nindent 12 }}{{- end }}
{{- with .Values.grypeOfflineDB.rollout.podAnnotations }}{{- toYaml . | nindent 12 }}{{- end }}
labels:
{{- include "kubescape-operator.labels" (dict "Chart" .Chart "Release" .Release "Values" .Values "app" .Values.grypeOfflineDB.name "tier" .Values.global.namespaceTier) | nindent 12 }}
{{- with .Values.grypeOfflineDB.podLabels }}{{- toYaml . | nindent 12 }}{{- end }}
{{- with .Values.grypeOfflineDB.rollout.podLabels }}{{- toYaml . | nindent 12 }}{{- end }}
armo.tier: "vuln-scan"
kubescape.io/tier: "core"
spec:
Expand All @@ -45,10 +45,10 @@ spec:
{{- end }}
containers:
- name: {{ .Values.grypeOfflineDB.name }}
image: "{{ .Values.serviceDiscovery.configMapUpdate.image.repository }}:{{ .Values.serviceDiscovery.configMapUpdate.image.tag }}"
imagePullPolicy: IfNotPresent
image: "{{ .Values.grypeOfflineDB.rollout.image.repository }}:{{ .Values.grypeOfflineDB.rollout.image.tag }}"
imagePullPolicy: {{ .Values.grypeOfflineDB.rollout.image.pullPolicy }}
resources:
{{ toYaml .Values.serviceDiscovery.resources | indent 14 }}
{{ toYaml .Values.grypeOfflineDB.rollout.resources | indent 14 }}
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
Expand All @@ -68,7 +68,9 @@ spec:
serviceAccountName: {{ .Values.grypeOfflineDB.name }}
automountServiceAccountToken: true
nodeSelector:
{{- if .Values.grypeOfflineDB.nodeSelector }}
{{- if .Values.grypeOfflineDB.rollout.nodeSelector }}
{{- toYaml .Values.grypeOfflineDB.rollout.nodeSelector | nindent 12 }}
{{- else if .Values.grypeOfflineDB.nodeSelector }}
{{- toYaml .Values.grypeOfflineDB.nodeSelector | nindent 12 }}
{{- else if .Values.customScheduling.nodeSelector }}
{{- toYaml .Values.customScheduling.nodeSelector | nindent 12 }}
Expand Down
50 changes: 4 additions & 46 deletions charts/kubescape-operator/templates/kubescape/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,42 +62,6 @@ spec:
type: RuntimeDefault
runAsUser: 65532
fsGroup: 65532
{{- if $components.serviceDiscovery.enabled }}
initContainers:
- name: {{ .Values.serviceDiscovery.urlDiscovery.name }}
image: "{{ .Values.serviceDiscovery.urlDiscovery.image.repository }}:{{ .Values.serviceDiscovery.urlDiscovery.image.tag }}"
imagePullPolicy: {{ .Values.serviceDiscovery.urlDiscovery.image.pullPolicy }}
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
runAsNonRoot: true
resources:
{{ toYaml .Values.serviceDiscovery.resources | indent 14 }}
env:
{{- if ne .Values.global.httpsProxy "" }}
- name: HTTPS_PROXY
value: "{{ .Values.global.httpsProxy }}"
- name : no_proxy
value: "{{ $no_proxy_envar_list }}"
{{- end }}
args:
- -method=get
- -scheme=https
- -host={{ .Values.server }}
- -path=api/v2/servicediscovery
- -path-output=/data/services.json
{{- if .Values.serviceDiscovery.urlDiscovery.insecureSkipTLSVerify }}
- -skip-ssl-verify=true
{{- end}}
volumeMounts:
- name: services
mountPath: /data
{{- if ne .Values.global.proxySecretFile "" }}
- name: proxy-secret
mountPath: /etc/ssl/certs/proxy.crt
subPath: proxy.crt
{{- end }}
{{- end }}
containers:
- name: kubescape
image: "{{ .Values.kubescape.image.repository }}:{{ .Values.kubescape.image.tag }}"
Expand Down Expand Up @@ -152,6 +116,10 @@ spec:
value: "/home/nonroot/.kubescape/host-scanner.yaml"
- name: LARGE_CLUSTER_SIZE
value: "1500"
{{- if .Values.server }}
- name: API_URL
value: "https://{{ .Values.server }}"
{{- end }}
{{- range .Values.kubescape.env }}
- name: {{ .name }}
value: "{{ .value }}"
Expand Down Expand Up @@ -306,12 +274,6 @@ spec:
mountPath: /etc/config/clusterData.json
readOnly: true
subPath: "clusterData.json"
{{- if $components.serviceDiscovery.enabled }}
- name: "services"
mountPath: /etc/config/services.json
readOnly: true
subPath: "services.json"
{{- end }}
{{- if .Values.volumeMounts }}
{{ toYaml .Values.volumeMounts | indent 8 }}
{{- end }}
Expand Down Expand Up @@ -360,10 +322,6 @@ spec:
items:
- key: "clusterData"
path: "clusterData.json"
{{- if $components.serviceDiscovery.enabled }}
- name: "services"
emptyDir: {}
{{- end }}
- name: host-scanner-definition
configMap:
name: host-scanner-definition
Expand Down
50 changes: 4 additions & 46 deletions charts/kubescape-operator/templates/kubevuln/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,42 +53,6 @@ spec:
type: RuntimeDefault
runAsUser: 65532
fsGroup: 65532
{{- if $components.serviceDiscovery.enabled }}
initContainers:
- name: {{ .Values.serviceDiscovery.urlDiscovery.name }}
image: "{{ .Values.serviceDiscovery.urlDiscovery.image.repository }}:{{ .Values.serviceDiscovery.urlDiscovery.image.tag }}"
imagePullPolicy: {{ .Values.serviceDiscovery.urlDiscovery.image.pullPolicy }}
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
runAsNonRoot: true
resources:
{{ toYaml .Values.serviceDiscovery.resources | indent 14 }}
env:
{{- if ne .Values.global.httpsProxy "" }}
- name: HTTPS_PROXY
value: "{{ .Values.global.httpsProxy }}"
- name : no_proxy
value: "{{ $no_proxy_envar_list }}"
{{- end }}
args:
- -method=get
- -scheme=https
- -host={{ .Values.server }}
- -path=api/v2/servicediscovery
- -path-output=/data/services.json
{{- if .Values.serviceDiscovery.urlDiscovery.insecureSkipTLSVerify }}
- -skip-ssl-verify=true
{{- end}}
volumeMounts:
- name: services
mountPath: /data
{{- if ne .Values.global.proxySecretFile "" }}
- name: proxy-secret
mountPath: /etc/ssl/certs/proxy.crt
subPath: proxy.crt
{{- end }}
{{- end }}
containers:
- name: {{ .Values.kubevuln.name }}
image: "{{ .Values.kubevuln.image.repository }}:{{ .Values.kubevuln.image.tag }}"
Expand Down Expand Up @@ -129,6 +93,10 @@ spec:
- name: SCANNER_MEMORY_LIMIT
value: {{ .Values.kubevuln.sbomScanner.resources.limits.memory | quote }}
{{- end }}
{{- if .Values.server }}
- name: API_URL
value: "https://{{ .Values.server }}"
{{- end }}
{{- range .Values.kubevuln.env }}
- name: {{ .name }}
value: "{{ .value }}"
Expand Down Expand Up @@ -168,12 +136,6 @@ spec:
mountPath: /etc/config/clusterData.json
readOnly: true
subPath: "clusterData.json"
{{- if $components.serviceDiscovery.enabled }}
- name: "services"
mountPath: /etc/config/services.json
readOnly: true
subPath: "services.json"
{{- end }}
- name: grype-db
mountPath: /home/nonroot/.cache/grype
{{- if .Values.kubevuln.sbomScanner.enabled }}
Expand Down Expand Up @@ -266,10 +228,6 @@ spec:
items:
- key: "clusterData"
path: "clusterData.json"
{{- if $components.serviceDiscovery.enabled }}
- name: "services"
emptyDir: {}
{{- end }}
- name: "grype-db"
{{- if .Values.kubevuln.config.grypeDbPersistence }}
persistentVolumeClaim:
Expand Down
48 changes: 4 additions & 44 deletions charts/kubescape-operator/templates/node-agent/_node-agent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ Parameters:
{{- end }}
- name: AGENT_VERSION
value: "{{ .Values.nodeAgent.image.tag }}"
{{- if .Values.server }}
- name: API_URL
value: "https://{{ .Values.server }}"
{{- end }}
{{- range .Values.nodeAgent.env }}
{{- if .autoscalerMode }}
- {{ toYaml . | nindent 2 | trim }}
Expand Down Expand Up @@ -152,12 +156,6 @@ Parameters:
mountPath: /etc/config/clusterData.json
readOnly: true
subPath: "clusterData.json"
{{- if .components.serviceDiscovery.enabled }}
- name: "services"
mountPath: /etc/config/services.json
readOnly: true
subPath: "services.json"
{{- end }}
- name: config
mountPath: /etc/config/config.json
readOnly: true
Expand Down Expand Up @@ -320,40 +318,6 @@ Parameters:
sleep $SLEEP_TIME
echo "Pod $(hostname) finished sleeping after $SLEEP_TIME seconds"
{{- end }}
{{- if .components.serviceDiscovery.enabled }}
- name: {{ .Values.serviceDiscovery.urlDiscovery.name }}
image: "{{ .Values.serviceDiscovery.urlDiscovery.image.repository }}:{{ .Values.serviceDiscovery.urlDiscovery.image.tag }}"
imagePullPolicy: {{ .Values.serviceDiscovery.urlDiscovery.image.pullPolicy }}
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
resources:
{{ toYaml .Values.serviceDiscovery.resources | indent 4 }}
env:
{{- if ne .Values.global.httpsProxy "" }}
- name: HTTPS_PROXY
value: "{{ .Values.global.httpsProxy }}"
- name: no_proxy
value: "{{ .no_proxy_envar_list }}"
{{- end }}
args:
- -method=get
- -scheme=https
- -host={{ .Values.server }}
- -path=api/v3/servicediscovery
- -path-output=/data/services.json
{{- if .Values.serviceDiscovery.urlDiscovery.insecureSkipTLSVerify }}
- -skip-ssl-verify=true
{{- end }}
volumeMounts:
- name: services
mountPath: /data
{{- if ne .Values.global.proxySecretFile "" }}
- name: proxy-secret
mountPath: /etc/ssl/certs/proxy.crt
subPath: proxy.crt
{{- end }}
{{- end }}
{{- end -}}

{{/*
Expand Down Expand Up @@ -392,10 +356,6 @@ Parameters:
items:
- key: "config.json"
path: "config.json"
{{- if .components.serviceDiscovery.enabled }}
- name: "services"
emptyDir: {}
{{- end }}
{{- if ne .Values.global.proxySecretFile "" }}
- name: proxy-secret
secret:
Expand Down
50 changes: 4 additions & 46 deletions charts/kubescape-operator/templates/synchronizer/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,42 +54,6 @@ spec:
type: RuntimeDefault
runAsUser: 65532
fsGroup: 65532
{{- if $components.serviceDiscovery.enabled }}
initContainers:
- name: {{ .Values.serviceDiscovery.urlDiscovery.name }}
image: "{{ .Values.serviceDiscovery.urlDiscovery.image.repository }}:{{ .Values.serviceDiscovery.urlDiscovery.image.tag }}"
imagePullPolicy: {{ .Values.serviceDiscovery.urlDiscovery.image.pullPolicy }}
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
runAsNonRoot: true
resources:
{{ toYaml .Values.serviceDiscovery.resources | indent 14 }}
env:
{{- if ne .Values.global.httpsProxy "" }}
- name: HTTPS_PROXY
value: "{{ .Values.global.httpsProxy }}"
- name : no_proxy
value: "{{ $no_proxy_envar_list }}"
{{- end }}
args:
- -method=get
- -scheme=https
- -host={{ .Values.server }}
- -path=api/v2/servicediscovery
- -path-output=/data/services.json
{{- if .Values.serviceDiscovery.urlDiscovery.insecureSkipTLSVerify }}
- -skip-ssl-verify=true
{{- end}}
volumeMounts:
- name: services
mountPath: /data
{{- if ne .Values.global.proxySecretFile "" }}
- name: proxy-secret
mountPath: /etc/ssl/certs/proxy.crt
subPath: proxy.crt
{{- end }}
{{- end }}
containers:
- name: {{ .Values.synchronizer.name }}
image: "{{ .Values.synchronizer.image.repository }}:{{ .Values.synchronizer.image.tag }}"
Expand Down Expand Up @@ -119,6 +83,10 @@ spec:
value: "{{ .Values.logger.level }}"
- name: KS_LOGGER_NAME
value: "{{ .Values.logger.name }}"
{{- if .Values.server }}
- name: API_URL
value: "https://{{ .Values.server }}"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
{{- end }}
{{- range .Values.synchronizer.env }}
- name: {{ .name }}
value: "{{ .value }}"
Expand Down Expand Up @@ -151,12 +119,6 @@ spec:
mountPath: /etc/config/clusterData.json
readOnly: true
subPath: "clusterData.json"
{{- if $components.serviceDiscovery.enabled }}
- name: "services"
mountPath: /etc/config/services.json
readOnly: true
subPath: "services.json"
{{- end }}
{{- if .Values.global.overrideDefaultCaCertificates.enabled }}
- name: custom-ca-certificates
mountPath: /etc/ssl/certs/ca-certificates.crt
Expand Down Expand Up @@ -209,10 +171,6 @@ spec:
items:
- key: "clusterData"
path: "clusterData.json"
{{- if $components.serviceDiscovery.enabled }}
- name: "services"
emptyDir: {}
{{- end }}
- name: config
configMap:
name: {{ .Values.synchronizer.name }}
Expand Down
Loading
Loading