diff --git a/charts/hub/README.md b/charts/hub/README.md index c59e32d..1f0c3ac 100644 --- a/charts/hub/README.md +++ b/charts/hub/README.md @@ -390,15 +390,6 @@ Below all configuration options and parameters are listed. | `kerberospipeline.export.logLevel` | Log verbosity level for `kerberospipeline.export`. | `"info"` | | `kerberospipeline.export.resources.requests.memory` | Memory request for `kerberospipeline.export`. | `"10Mi"` | | `kerberospipeline.export.resources.requests.cpu` | CPU request for `kerberospipeline.export`. | `"10m"` | -| `kerberospipeline.redaction.repository` | Container image repository for `kerberospipeline.redaction`. | `"ghcr.io/uug-ai/hub-pipeline-redaction"` | -| `kerberospipeline.redaction.pullPolicy` | Image pull policy for `kerberospipeline.redaction`. | `"IfNotPresent"` | -| `kerberospipeline.redaction.tag` | Container image tag/version for `kerberospipeline.redaction`. | `"v1.0.0"` | -| `kerberospipeline.redaction.replicas` | Number of replicas for `kerberospipeline.redaction`. | `2` | -| `kerberospipeline.redaction.logLevel` | Log verbosity level for `kerberospipeline.redaction`. | `"info"` | -| `kerberospipeline.redaction.resources.requests.memory` | Memory request for `kerberospipeline.redaction`. | `"512Mi"` | -| `kerberospipeline.redaction.resources.requests.cpu` | CPU request for `kerberospipeline.redaction`. | `"500m"` | -| `kerberospipeline.redaction.resources.limits.memory` | Memory limit for `kerberospipeline.redaction`. | `"2Gi"` | -| `kerberospipeline.redaction.resources.limits.cpu` | CPU limit for `kerberospipeline.redaction`. | `"1000m"` | | `email.provider` | The email service provider for sending out messages over email , use `'mailgun'` or `'smtp'`. | `"mailgun"` | | `email.from` | The email address that is sending messages in name of, by default `'support@yourdomain.com'`. | `"support@yourdomain.com"` | | `email.displayName` | The display name that is sending messages in name of, by default `'yourdomain.com'` | `"yourdomain.com"` | diff --git a/charts/hub/templates/kerberos-pipeline/pipe-redaction.yaml b/charts/hub/templates/kerberos-pipeline/pipe-redaction.yaml deleted file mode 100644 index 5e4811d..0000000 --- a/charts/hub/templates/kerberos-pipeline/pipe-redaction.yaml +++ /dev/null @@ -1,116 +0,0 @@ -{{- if or (eq .Values.mode "all") (eq .Values.mode "pipeline") -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: pipe-redaction - namespace: {{ .Release.Namespace }} -spec: - replicas: {{ .Values.kerberospipeline.redaction.replicas }} - selector: - matchLabels: - app: pipe-redaction - minReadySeconds: 10 - strategy: - type: RollingUpdate - rollingUpdate: - maxUnavailable: 1 - maxSurge: 1 - template: - metadata: - labels: - app: pipe-redaction - spec: - {{- if .Values.kerberoshub.serviceAccount.create }} - serviceAccountName: {{ default (printf "%s-%s-sa" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-") .Values.kerberoshub.serviceAccount.name }} - {{- end }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.kerberospipeline.redaction.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.kerberospipeline.redaction.topologySpreadConstraints }} - topologySpreadConstraints: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: pipe-redaction - image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.redaction.repository }}:{{ .Values.kerberospipeline.redaction.tag }}" - imagePullPolicy: {{ .Values.kerberospipeline.redaction.pullPolicy }} - {{- with .Values.kerberospipeline.redaction.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.kerberospipeline.redaction.volumeMounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - env: - - name: LOG_LEVEL - value: "{{ .Values.kerberospipeline.redaction.logLevel }}" - - name: CLOUD_PROVIDER - value: "{{ .Values.cloudProvider }}" - - name: QUEUE_SYSTEM - value: "{{ .Values.queueProvider }}" - - # Kafka settings - - name: KAFKA_BROKER - value: "{{ .Values.kafka.broker }}" - - name: KAFKA_USERNAME - value: "{{ .Values.kafka.username }}" - - name: KAFKA_PASSWORD - value: "{{ .Values.kafka.password }}" - - name: KAFKA_MECHANISM - value: "{{ .Values.kafka.mechanism }}" - - name: KAFKA_SECURITY - value: "{{ .Values.kafka.security }}" - - # RabbitMQ settings - - name: RABBITMQ_HOST - value: "{{ .Values.rabbitmq.host }}" - - name: RABBITMQ_EXCHANGE - value: "{{ .Values.rabbitmq.exchange }}" - - name: RABBITMQ_USERNAME - value: "{{ .Values.rabbitmq.username }}" - - name: RABBITMQ_PASSWORD - value: "{{ .Values.rabbitmq.password }}" - - # Kerberos Vault (used to download the source media and upload the redacted artifact). - - name: KERBEROS_STORAGE_URI - value: "{{ .Values.kerberosvault.uri }}" - - name: KERBEROS_STORAGE_PROVIDER - value: "{{ .Values.kerberosvault.provider }}" - - name: KERBEROS_STORAGE_ACCESS_KEY - value: "{{ .Values.kerberosvault.accesskey }}" - - name: KERBEROS_STORAGE_SECRET - value: "{{ .Values.kerberosvault.secretkey }}" - - {{- if .Values.opentelemetry.enabled }} - # Open Telemetry tracing - - name: OTEL_EXPORTED_OTLP_ENABLED - value: "{{ .Values.opentelemetry.enabled }}" - - name: OTEL_EXPORTED_OTLP_ROUTING_ENABLED - value: "{{ .Values.opentelemetry.routingEnabled }}" - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: "{{ .Values.opentelemetry.collector.endpoint }}" - {{- end }} ---- -apiVersion: v1 -kind: Service -metadata: - name: pipe-redaction - namespace: {{ .Release.Namespace }} - labels: - app: pipe-redaction - service: pipe -spec: - ports: - - name: hub-metrics - port: 8080 - targetPort: 8080 - protocol: TCP - selector: - app: pipe-redaction -{{- end }} diff --git a/charts/hub/values.yaml b/charts/hub/values.yaml index 4cf36db..c18fed0 100644 --- a/charts/hub/values.yaml +++ b/charts/hub/values.yaml @@ -1077,27 +1077,6 @@ kerberospipeline: requests: memory: 10Mi cpu: 10m - redaction: - repository: ghcr.io/uug-ai/hub-pipeline-redaction - pullPolicy: IfNotPresent - tag: "v1.0.0" - replicas: 2 # Number of pods for the service. - topologySpreadConstraints: [] # Optional pod topology spread constraints (empty = none). - # Optional extra volumes / volumeMounts for this deployment (empty = none). - #volumes: - # - name: extra - # emptyDir: {} - #volumeMounts: - # - name: extra - # mountPath: /data - logLevel: "info" # possible values: trace, debug, info, warn, error - resources: - requests: - memory: 512Mi - cpu: 500m - limits: - memory: 2Gi - cpu: 1000m ########################################################################### # Email configuration #