Decommission notification publisher

charts/hyades/ci/test-initializer-values.yaml

@@ -128,13 +128,13 @@ extraObjects:
           - PLAINTEXT://0.0.0.0:9092
           - --advertise-kafka-addr
           - PLAINTEXT://redpanda.{{ .Release.Namespace }}.svc.cluster.local:9092
-        ports:
-        - name: kafka-api
-          containerPort: 9092
-          protocol: TCP
-        - name: redpanda-admin
-          containerPort: 9644
-          protocol: TCP
+          ports:
+          - name: kafka-api
+            containerPort: 9092
+            protocol: TCP
+          - name: redpanda-admin
+            containerPort: 9644
+            protocol: TCP
 - apiVersion: v1
   kind: Service
   metadata:

charts/hyades/ci/test-values.yaml

@@ -119,13 +119,13 @@ extraObjects:
           - PLAINTEXT://0.0.0.0:9092
           - --advertise-kafka-addr
           - PLAINTEXT://redpanda.{{ .Release.Namespace }}.svc.cluster.local:9092
-        ports:
-        - name: kafka-api
-          containerPort: 9092
-          protocol: TCP
-        - name: redpanda-admin
-          containerPort: 9644
-          protocol: TCP
+          ports:
+          - name: kafka-api
+            containerPort: 9092
+            protocol: TCP
+          - name: redpanda-admin
+            containerPort: 9644
+            protocol: TCP
 - apiVersion: v1
   kind: Service
   metadata:

charts/hyades/ci/test-vulnanalyzer-statefulset-values.yaml

@@ -125,13 +125,13 @@ extraObjects:
           - PLAINTEXT://0.0.0.0:9092
           - --advertise-kafka-addr
           - PLAINTEXT://redpanda.{{ .Release.Namespace }}.svc.cluster.local:9092
-        ports:
-        - name: kafka-api
-          containerPort: 9092
-          protocol: TCP
-        - name: redpanda-admin
-          containerPort: 9644
-          protocol: TCP
+          ports:
+          - name: kafka-api
+            containerPort: 9092
+            protocol: TCP
+          - name: redpanda-admin
+            containerPort: 9644
+            protocol: TCP
 - apiVersion: v1
   kind: Service
   metadata:

charts/hyades/templates/_helpers.tpl

@@ -220,49 +220,6 @@ Frontend image
 {{- end -}}
 {{- end -}}
 
-{{/*
-Notification publisher labels
-*/}}
-{{- define "hyades.notificationPublisherLabels" -}}
-{{ include "hyades.commonLabels" . }}
-{{ include "hyades.notificationPublisherSelectorLabels" . }}
-app.kubernetes.io/version: {{ .Chart.AppVersion }}
-{{- end -}}
-
-{{/*
-Notification publisher selector labels
-*/}}
-{{- define "hyades.notificationPublisherSelectorLabels" -}}
-{{ include "hyades.commonSelectorLabels" . }}
-app.kubernetes.io/name: {{ printf "%s-notification-publisher" (include "hyades.name" .) }}
-app.kubernetes.io/component: notification-publisher
-{{- end -}}
-
-{{/*
-Notification publisher name
-*/}}
-{{- define "hyades.notificationPublisherName" -}}
-{{- printf "%s-notification-publisher" (include "hyades.name" .) -}}
-{{- end -}}
-
-{{/*
-Notification publisher fully qualified name
-*/}}
-{{- define "hyades.notificationPublisherFullname" -}}
-{{- printf "%s-notification-publisher" (include "hyades.fullname" .) -}}
-{{- end -}}
-
-{{/*
-Notification publisher image
-*/}}
-{{- define "hyades.notificationPublisherImage" -}}
-{{- if eq (substr 0 7 .Values.notificationPublisher.image.tag) "sha256:" -}}
-{{- printf "%s/%s@%s" (.Values.notificationPublisher.image.registry | default .Values.common.image.registry) .Values.notificationPublisher.image.repository .Values.notificationPublisher.image.tag -}}
-{{- else -}}
-{{- printf "%s/%s:%s" (.Values.notificationPublisher.image.registry | default .Values.common.image.registry) .Values.notificationPublisher.image.repository (.Values.notificationPublisher.image.tag | default .Chart.AppVersion) -}}
-{{- end -}}
-{{- end -}}
-
 
 {{/*
 Repository metadata analyzer labels

charts/hyades/templates/vuln-analyzer/deployment.yaml

@@ -31,61 +31,61 @@
       {{- if .Values.initializer.enabled }}
       - {{ include "hyades.initializerWaiterContainer" . | nindent 8 }}
       {{- end }}
-      {{- with .Values.notificationPublisher.initContainers }}
+      {{- with .Values.vulnAnalyzer.initContainers }}
       {{- tpl (toYaml .) $ | nindent 6 }}
       {{- end }}
       serviceAccountName: {{ include "hyades.serviceAccountName" . }}
       containers:
       - name: {{ include "hyades.vulnAnalyzerName" . }}
         image: {{ include "hyades.vulnAnalyzerImage" . }}
         imagePullPolicy: {{ .Values.vulnAnalyzer.image.pullPolicy }}
         securityContext: {{ toYaml .Values.vulnAnalyzer.securityContext | nindent 10 }}
         {{- with .Values.vulnAnalyzer.command }}
         command: {{ toYaml . | nindent 8 }}
         {{- end }}
         {{- with .Values.vulnAnalyzer.args }}
         args: {{ toYaml . | nindent 8 }}
         {{- end }}
         resources: {{- toYaml .Values.vulnAnalyzer.resources | nindent 10 }}
         env:
         {{- with .Values.common.database.jdbcUrl }}
         - name: QUARKUS_DATASOURCE_JDBC_URL
           value: {{ tpl . $ | quote }}
         {{- end}}
         {{- with .Values.common.database.username }}
         - name: QUARKUS_DATASOURCE_USERNAME
           value: {{ . | quote }}
         {{- end }}
         {{- with .Values.common.database.password }}
         - name: QUARKUS_DATASOURCE_PASSWORD
           value: {{ . | quote }}
         {{- end }}
         - name: KAFKA_BOOTSTRAP_SERVERS
           value: {{ tpl .Values.common.kafka.bootstrapServers $ | quote }}
         {{- with .Values.common.kafka.topicPrefix }}
         - name: DT_KAFKA_TOPIC_PREFIX
           value: {{ . | quote }}
         {{- end }}
         {{- with .Values.vulnAnalyzer.extraEnv }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         {{- with .Values.vulnAnalyzer.extraEnvFrom }}
         envFrom: {{ toYaml . | nindent 8 }}
         {{- end }}
         ports:
         - name: web
           containerPort: 8092
           protocol: TCP
         volumeMounts:
         - name: tmp
           mountPath: /tmp
         {{- with .Values.vulnAnalyzer.additionalVolumeMounts }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         livenessProbe:
           httpGet:
             scheme: HTTP
             port: web
             path: /q/health/live
           failureThreshold: {{ .Values.vulnAnalyzer.probes.liveness.failureThreshold }}
           initialDelaySeconds: {{ .Values.vulnAnalyzer.probes.liveness.initialDelaySeconds }}

charts/hyades/templates/vuln-analyzer/statefulset.yaml

@@ -30,7 +30,7 @@ spec:
       {{- if .Values.initializer.enabled }}
       - {{ include "hyades.initializerWaiterContainer" . | nindent 8 }}
       {{- end }}
-      {{- with .Values.notificationPublisher.initContainers }}
+      {{- with .Values.vulnAnalyzer.initContainers }}
       {{- tpl (toYaml .) $ | nindent 6 }}
       {{- end }}
       serviceAccountName: {{ include "hyades.serviceAccountName" . }}

charts/hyades/values.schema.json

@@ -288,76 +288,6 @@
         }
       }
     },
-    "notificationPublisher": {
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean"
-        },
-        "replicaCount": {
-          "type": "integer"
-        },
-        "deployment": {
-          "type": "object",
-          "properties": {
-            "strategy": {
-              "type": "object"
-            }
-          }
-        },
-        "annotations": {
-          "type": "object"
-        },
-        "image": {
-          "$ref": "#/$defs/image"
-        },
-        "command": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "args": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "resources": {
-          "$ref": "#/$defs/resources"
-        },
-        "securityContext": {
-          "type": "object"
-        },
-        "extraEnv": {
-          "$ref": "#/$defs/objectArray"
-        },
-        "extraEnvFrom": {
-          "$ref": "#/$defs/objectArray"
-        },
-        "extraContainers": {
-          "$ref": "#/$defs/objectArray"
-        },
-        "tolerations": {
-          "$ref": "#/$defs/objectArray"
-        },
-        "probes": {
-          "$ref": "#/$defs/probes"
-        },
-        "additionalVolumeMounts": {
-          "$ref": "#/$defs/objectArray"
-        },
-        "additionalVolumes": {
-          "$ref": "#/$defs/objectArray"
-        },
-        "initContainers": {
-          "$ref": "#/$defs/objectArray"
-        },
-        "nodeSelector": {
-          "type": "object"
-        }
-      }
-    },
     "repoMetaAnalyzer": {
       "type": "object",
       "properties": {