diff --git a/charts/orb/Chart.yaml b/charts/orb/Chart.yaml index 2e7362f..e35b42b 100644 --- a/charts/orb/Chart.yaml +++ b/charts/orb/Chart.yaml @@ -10,7 +10,7 @@ name: orb description: Orb Observability Platform icon: https://avatars1.githubusercontent.com/u/13207490 type: application -version: 1.0.49 +version: 1.0.50 appVersion: "0.26.0" home: https://getorb.io sources: diff --git a/charts/orb/templates/sinker-deployment.yaml b/charts/orb/templates/sinker-deployment.yaml deleted file mode 100644 index 36a2327..0000000 --- a/charts/orb/templates/sinker-deployment.yaml +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright (c) Mainflux -# SPDX-License-Identifier: Apache-2.0 - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Release.Name }}-sinker -spec: - replicas: {{ .Values.defaults.replicaCount }} - selector: - matchLabels: - app: {{ .Release.Name }} - component: sinker - template: - metadata: - annotations: - commit_sha: {{ .Values.defaults.image.commitHash }} - {{- with .Values.sinker.metadata.annotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - app: {{ .Release.Name }} - component: sinker - spec: - containers: - - env: - - name: MF_JAEGER_URL - {{ if not .Values.defaults.jaegerHost }} - value: {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }} - {{ else }} - value: {{ .Values.defaults.jaegerHost }}:{{ .Values.defaults.jaegerPort }} - {{ end }} - - name: ORB_SINKER_ES_URL - {{ if not .Values.sinker.redisESHost }} - value: {{ .Release.Name }}-redis-streams-master:{{ .Values.sinker.redisESPort }} - {{ else }} - value: {{ .Values.sinker.redisESHost }}:{{ .Values.sinker.redisESPort }} - {{ end }} - - name: ORB_SINKER_CACHE_URL - {{ if not .Values.sinker.redisCacheHost }} - value: {{ .Release.Name }}-redis-sinker-master:{{ .Values.sinker.redisCachePort }} - {{ else }} - value: {{ .Values.sinker.redisCacheHost }}:{{ .Values.sinker.redisCachePort }} - {{ end }} - - name: ORB_FLEET_GRPC_URL - value: - {{ .Release.Name }}-envoy:{{ .Values.fleet.grpcPort }} - - name: ORB_SINKS_GRPC_URL - value: - {{ .Release.Name }}-envoy:{{ .Values.sinks.grpcPort }} - - name: ORB_POLICIES_GRPC_URL - value: - {{ .Release.Name }}-envoy:{{ .Values.policies.grpcPort }} - - name: ORB_SINKER_HTTP_PORT - value: "{{ .Values.sinker.httpPort }}" - - name: ORB_SINKER_LOG_LEVEL - value: {{ default .Values.defaults.logLevel .Values.sinker.logLevel }} - - name: ORB_SINKER_NATS_URL - value: - nats://{{ .Release.Name }}-nats-client:{{ .Values.defaults.natsPort }} - - name: MF_AUTH_GRPC_URL - value: - {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }} - image: "{{ default .Values.defaults.image.repository .Values.sinker.image.repository }}/{{ default .Values.sinker.image.name }}:{{ default .Values.defaults.image.tag .Values.sinker.image.tag }}" - imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.sinker.image.pullPolicy }} - name: {{ .Release.Name }}-sinker - ports: - - containerPort: {{ .Values.sinker.httpPort }} - protocol: TCP - - containerPort: 2345 - protocol: TCP - dnsPolicy: ClusterFirst - restartPolicy: Always diff --git a/charts/orb/templates/sinker-service.yaml b/charts/orb/templates/sinker-service.yaml deleted file mode 100644 index c39c874..0000000 --- a/charts/orb/templates/sinker-service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) Mainflux -# SPDX-License-Identifier: Apache-2.0 - -apiVersion: v1 -kind: Service -metadata: - name: {{ .Release.Name }}-sinker -spec: - selector: - app: {{ .Release.Name }} - component: sinker - ports: - - protocol: TCP - port: {{ .Values.sinker.httpPort }} - name: {{ .Release.Name }}-sinker-http diff --git a/charts/orb/values.yaml b/charts/orb/values.yaml index 861141d..0936119 100644 --- a/charts/orb/values.yaml +++ b/charts/orb/values.yaml @@ -118,17 +118,6 @@ sinks: metadata: annotations: {} -sinker: - image: - name: "orb-sinker" - httpPort: 8201 - redisESPort: 6379 - redisESHost: "" # Set this field with host if you want to point to external database such as Elasticache - redisCachePort: 6379 - redisCacheHost: "" # Set this field with host if you want to point to external database such as Elasticache - metadata: - annotations: {} - sinkerOtel: image: name: "orb-sinker"