feat: update atlantis chart and values for monolith

charts/atlantis/templates/ingress.yaml

@@ -54,8 +54,8 @@ spec:
                 port:
                   number: {{ $svcPort }}
               {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
+              serviceName: {{ .serviceName | default $fullName }}
+              servicePort: {{ .servicePort | default $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

charts/atlantis/templates/pubsub.yaml

@@ -1,54 +0,0 @@
-apiVersion: dapr.io/v1alpha1
-kind: Component
-metadata:
-  name: pubsub
-  namespace: {{ .Release.Namespace }}
-spec:
-  version: v1
-  type: pubsub.rabbitmq
-  metadata:
-  - name: hostname
-    value: {{ .Values.rabbitmq.service }}.{{ .Values.rabbitmq.namespace | default "rabbitmq" }}
-  - name: username
-    value: {{ .Values.rabbitmq.username }}
-  - name: password
-    secretKeyRef:
-      name: {{ .Values.rabbitmq.secretName | default (printf "%s-rabbitmq" .Release.Name) }}
-      key:  rabbitmq-password
-  - name: protocol
-    value: amqp
-  - name: durable
-    value: true
-  - name: deletedWhenUnused
-    value: false
-  - name: autoAck
-    value: false
-  - name: deliveryMode
-    value: 1
-  - name: requeueInFailure
-    value: false
-  - name: prefetchCount
-    value: 0
-  - name: reconnectWait
-    value: 0
-  - name: concurrencyMode
-    value: parallel
-  - name: publisherConfirm
-    value: false
-  - name: backOffPolicy
-    value: exponential
-  - name: backOffInitialInterval
-    value: 100
-  - name: backOffMaxRetries
-    value: 16
-  - name: enableDeadLetter # Optional enable dead Letter or not
-    value: true
-  - name: maxLen # Optional max message count in a queue
-    value: 3000
-  - name: maxLenBytes # Optional maximum length in bytes of a queue.
-    value: 10485760
-  - name: exchangeKind
-    value: fanout
-  - name: clientName
-    value: "{appID}"
-

charts/atlantis/templates/servicemonitor.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "Atlantis.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  endpoints:
+  - honorLabels: false
+    path: /metrics
+    port: http
+  jobLabel: {{ .Values.serviceMonitor.label | default (include "Atlantis.fullname" .) }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: {{ include "Atlantis.fullname" . }}
+      app.kubernetes.io/name: atlantis
+{{- end }}

charts/atlantis/templates/statestore.yaml

@@ -1,22 +0,0 @@
-apiVersion: dapr.io/v1alpha1
-kind: Component
-metadata:
-  name: statestore
-  namespace: {{ .Release.Namespace }}
-spec:
-  type: state.redis
-  version: v1
-  metadata:
-  - name: redisHost
-    value: {{ .Release.Name }}-redis-master:6379
-  - name: redisUsername
-    value: default
-  - name: redisPassword
-    secretKeyRef:
-      name: {{ .Release.Name }}-redis
-      key:  redis-password
-  - name: actorStateStore
-    value: "true"
-scopes:
-  - atlantis
-  - {{ .Release.Name }}-atlantis

charts/atlantis/templates/subscriptions.yaml

@@ -1,31 +0,0 @@
-apiVersion: dapr.io/v2alpha1
-kind: Subscription
-metadata:
-  name: hipster-events
-  namespace: {{ .Release.Namespace }}
-spec:
-  topic: hipster
-  routes:
-    default: /hipster-events
-  pubsubname: pubsub
-  metadata:
-    queueType: quorum
-scopes:
-- atlantis
-- {{ .Release.Name}}-atlantis
----
-apiVersion: dapr.io/v2alpha1
-kind: Subscription
-metadata:
-  name: inbox-events
-  namespace: {{ .Release.Namespace }}
-spec:
-  topic: inbox
-  routes:
-    default: /inbox-events
-  pubsubname: pubsub
-  metadata:
-    queueType: quorum
-scopes:
-- atlantis
-- {{ .Release.Name}}-atlantis

charts/atlantis/templates/tracing.yaml

@@ -1,11 +0,0 @@
-apiVersion: dapr.io/v1alpha1
-kind: Configuration
-metadata:
-  name: tracing
-  namespace: {{ .Release.Namespace }}
-spec:
-  tracing:
-    samplingRate: "1"
-    zipkin:
-      endpointAddress: {{ .Values.tracing.endpoint }}
-

charts/atlantis/values.yaml

@@ -61,6 +61,10 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
+        - path: /events
+          pathType: ImplementationSpecific
+          serviceName: main-ingress-nginx-defaultbackend.ingress-nginx
+          servicePort: 80
   tls:
     - hosts:
         - atlantis.srv.oceanbox.io
@@ -119,16 +123,6 @@ redis:
         ephemeral-storage: 50Mi
         memory: 128Mi
 
-tracing:
-  namespace: otel
-  endpoint: "http://opentelemetry-collector.otel:9411/api/v2/spans"
-
-rabbitmq:
-  namespace: rabbitmq
-  service: staging-rabbitmq
-  username: user
-  # secretName: staging-rabbitmq
-
 resources: {}
 # We usually recommend not to specify default resources and to leave this as a conscious
 # choice for the user. This also increases chances charts run on environments with little