From bc954550459071104c72cc847a2fd885ef46c51b Mon Sep 17 00:00:00 2001 From: Muhammad Abduh Date: Tue, 15 Nov 2022 13:25:41 +0700 Subject: [PATCH 1/3] feat(siren): use app chart and upgrade version --- stable/siren/Chart.lock | 9 ++ stable/siren/Chart.yaml | 22 ++- stable/siren/charts/app-0.4.2.tgz | Bin 0 -> 5594 bytes stable/siren/templates/NOTES.txt | 17 --- stable/siren/templates/_helper.tpl | 25 ---- stable/siren/templates/config.yaml | 11 -- stable/siren/templates/deployment.yaml | 69 --------- stable/siren/templates/ingress.yaml | 30 ---- stable/siren/templates/secret.yaml | 14 -- stable/siren/templates/service.yaml | 30 ---- stable/siren/values.yaml | 199 ++++++++++++++----------- 11 files changed, 135 insertions(+), 291 deletions(-) create mode 100644 stable/siren/Chart.lock create mode 100644 stable/siren/charts/app-0.4.2.tgz delete mode 100644 stable/siren/templates/NOTES.txt delete mode 100644 stable/siren/templates/_helper.tpl delete mode 100644 stable/siren/templates/config.yaml delete mode 100644 stable/siren/templates/deployment.yaml delete mode 100644 stable/siren/templates/ingress.yaml delete mode 100644 stable/siren/templates/secret.yaml delete mode 100644 stable/siren/templates/service.yaml diff --git a/stable/siren/Chart.lock b/stable/siren/Chart.lock new file mode 100644 index 00000000..3b0788eb --- /dev/null +++ b/stable/siren/Chart.lock @@ -0,0 +1,9 @@ +dependencies: +- name: app + repository: https://odpf.github.io/charts/ + version: 0.4.2 +- name: app + repository: https://odpf.github.io/charts/ + version: 0.4.2 +digest: sha256:540f8f9e529268f3a792c15cc904e6db801f252a2e933d433dc96d7c46f06732 +generated: "2022-11-15T13:19:00.887767+07:00" diff --git a/stable/siren/Chart.yaml b/stable/siren/Chart.yaml index 5e7cf82f..797ae4d2 100644 --- a/stable/siren/Chart.yaml +++ b/stable/siren/Chart.yaml @@ -1,9 +1,17 @@ -apiVersion: v1 -description: Siren Helm chart +apiVersion: v2 name: siren -version: 0.0.1 -appVersion: v0.0.1 +description: Siren Helm chart +version: 0.1.0 +appVersion: v0.5.0 home: https://github.com/odpf/siren -sources: -- https://github.com/odpf/siren -- https://github.com/odpf/charts +dependencies: +- name: app + version: "0.4.2" + repository: "https://odpf.github.io/charts/" + alias: siren-notification-worker + condition: siren-notification-worker.enabled +- name: app + version: "0.4.2" + repository: "https://odpf.github.io/charts/" + alias: siren-notification-dlq-worker + condition: siren-notification-dlq-worker.enabled diff --git a/stable/siren/charts/app-0.4.2.tgz b/stable/siren/charts/app-0.4.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..700b5fe843f60412589feae885dd42208ed2365f GIT binary patch literal 5594 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 literal 0 HcmV?d00001 diff --git a/stable/siren/templates/NOTES.txt b/stable/siren/templates/NOTES.txt deleted file mode 100644 index 6976657f..00000000 --- a/stable/siren/templates/NOTES.txt +++ /dev/null @@ -1,17 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.hostname }} - http://{{- .Values.ingress.hostname }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "siren.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get svc -w {{ template "siren.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "siren.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - echo http://$SERVICE_IP:{{ .Values.service.externalPort }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "siren.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 3000:{{ .Values.service.internalPort }} - echo "Visit http://127.0.0.1:3000 to use your application" -{{- end }} diff --git a/stable/siren/templates/_helper.tpl b/stable/siren/templates/_helper.tpl deleted file mode 100644 index 9ca7a39c..00000000 --- a/stable/siren/templates/_helper.tpl +++ /dev/null @@ -1,25 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "siren.name" -}} - {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "siren.fullname" -}} - {{- if .Values.fullnameOverride -}} - {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} - {{- else -}} - {{- $name := default .Chart.Name .Values.nameOverride -}} - {{- if contains $name .Release.Name -}} - {{- printf .Release.Name | trunc 63 | trimSuffix "-" -}} - {{- else -}} - {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} - {{- end -}} - {{- end -}} -{{- end -}} diff --git a/stable/siren/templates/config.yaml b/stable/siren/templates/config.yaml deleted file mode 100644 index 6ff05ba9..00000000 --- a/stable/siren/templates/config.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "siren.fullname" . }}-config - namespace: {{ .Release.Namespace }} - labels: - {{- if .Values.labels }} - {{- toYaml .Values.labels | trim | nindent 4 }} - {{- end }} -data: - {{- toYaml .Values.config | nindent 2 }} diff --git a/stable/siren/templates/deployment.yaml b/stable/siren/templates/deployment.yaml deleted file mode 100644 index 336b9300..00000000 --- a/stable/siren/templates/deployment.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "siren.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- if .Values.labels }} - {{- toYaml .Values.labels | trim | nindent 4 }} - {{- end }} - run: {{ .Release.Name }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - run: {{ .Release.Name }} - template: - metadata: - annotations: - checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} - {{- if .Values.podAnnotations }} - {{- toYaml .Values.podAnnotations | trim | nindent 8 }} - {{- end }} - labels: - {{- if .Values.labels }} - {{- toYaml .Values.labels | trim | nindent 8 }} - {{- end }} - run: {{ .Release.Name }} - spec: - containers: - - name: siren - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - args: ["serve"] - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - containerPort: {{ .Values.service.internalPort }} - protocol: TCP - livenessProbe: - httpGet: - path: {{ .Values.livenessProbe.httpGetPath }} - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} - timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} - failureThreshold: {{ .Values.livenessProbe.failureThreshold }} - readinessProbe: - httpGet: - path: {{ .Values.readinessProbe.httpGetPath }} - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} - timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - envFrom: - - configMapRef: - name: {{ template "siren.fullname" . }}-config - - secretRef: - name: {{ template "siren.fullname" . }}-secret - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/stable/siren/templates/ingress.yaml b/stable/siren/templates/ingress.yaml deleted file mode 100644 index cc3f1495..00000000 --- a/stable/siren/templates/ingress.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{- if .Values.ingress.enabled -}} - {{- $serviceName := include "siren.fullname" . -}} - {{- $servicePort := .Values.service.externalPort -}} - {{- $ingressPath := .Values.ingress.path -}} -apiVersion: networking.k8s.io/v1beta1 -kind: Ingress -metadata: - name: {{ template "siren.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- if .Values.ingress.labels }} - {{- toYaml .Values.ingress.labels | nindent 4 }} - {{- end}} - run: {{ .Release.Name }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end}} -spec: - rules: - {{- range $host := .Values.ingress.hosts }} - - host: {{ $host }} - http: - paths: - - path: {{ $ingressPath }} - backend: - serviceName: {{ $serviceName }} - servicePort: {{ $servicePort }} - {{- end -}} -{{- end -}} diff --git a/stable/siren/templates/secret.yaml b/stable/siren/templates/secret.yaml deleted file mode 100644 index 00281ed8..00000000 --- a/stable/siren/templates/secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "siren.fullname" . }}-secret - namespace: {{ .Release.Namespace }} - labels: - {{- if .Values.labels }} - {{- toYaml .Values.labels | trim | nindent 4 }} - {{- end }} -type: Opaque -data: - {{- range $key, $val := .Values.secretConfig -}} - {{- (print $key ": " ($val | toString | b64enc | quote )) | nindent 2 -}} - {{- end }} diff --git a/stable/siren/templates/service.yaml b/stable/siren/templates/service.yaml deleted file mode 100644 index 6bf5608e..00000000 --- a/stable/siren/templates/service.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "siren.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- if .Values.labels }} - {{- toYaml .Values.labels | trim | nindent 4 }} - {{- end }} - {{- if .Values.service.annotations }} - run: {{ .Release.Name }} - annotations: - {{- toYaml .Values.service.annotations | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.service.type }} - {{- if .Values.service.loadBalancerSourceRanges}} - loadBalancerSourceRanges: - {{- toYaml .Values.service.loadBalancerSourceRanges | nindent 4 }} - {{- end}} - ports: - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.service.internalPort }} - {{- if .Values.service.nodePort }} - nodePort: {{ .Values.service.nodePort }} - {{- end}} - protocol: TCP - name: {{ template "siren.name" . }} - selector: - run: {{ .Release.Name }} diff --git a/stable/siren/values.yaml b/stable/siren/values.yaml index 319a382f..e18b17ae 100644 --- a/stable/siren/values.yaml +++ b/stable/siren/values.yaml @@ -1,99 +1,122 @@ -replicaCount: 1 -podAnnotations: {} -labels: {} -## String to fully override siren.fullname template -## -# fullnameOverride: -## String to fully override siren.name template -## -# nameOverride: +siren-app: + image: + repository: odpf/siren + pullPolicy: Always + tag: latest + container: + args: + - server + - start + livenessProbe: + httpGet: + path: /ping + port: tcp + readinessProbe: + httpGet: + path: /ping + port: tcp -image: - # -- Image to use for deploying siren - repository: odpf/siren - tag: v0.2.0 - pullPolicy: IfNotPresent + migration: + enabled: true + args: + - server + - migrate -# -- Environement variables needed by siren -config: - CORTEX_ALERTMANAGER_URL: "http://localhost:8080" + service: + annotations: + projectcontour.io/upstream-protocol.h2c: tcp -secretConfig: - # -- Postgres database connection details - DB_HOST: localhost - DB_NAME: siren - DB_USER: "" - DB_PASSWORD: "" - DB_PORT: 5432 + ingress: + enabled: true + annotations: + kubernetes.io/ingress.class: contour + hosts: + - host: siren.example.com + paths: + - path: / + pathType: ImplementationSpecific + backend: + service: + port: + number: 80 + config: + # SERVICE_PORT: 80 + DB_DRIVER: postgres + NOTIFICATION_QUEUE_KIND: postgres + NOTIFICATION_MESSAGE_HANDLER_ENABLED: false + NOTIFICATION_MESSAGE_DLQ_HANDLER_ENABLED: false + # PROVIDERS_CORTEX_WEBHOOK_BASE_API: http://localhost:8080/v1beta1/alerts/cortex + + secretConfig: + DB_URL: postgres://postgres:@localhost:5432/siren?sslmode=disable + SERVICE_ENCRYPTION_KEY: ____STRING_OF_32_CHARACTERS_____ -ingress: - # -- Kubernetes ingress details - enabled: true - # -- Used to create Ingress record (should used with service.type: ClusterIP). - hosts: - - siren.example.com - # -- The ingress path. Useful to host siren on a subpath, such as `/v1`. - path: / - labels: - # -- Used to add custom labels to the Ingress - # Useful if for example you have multiple Ingress controllers and want your Ingress controllers to bind to specific Ingresses - # traffic: internal - annotations: - kubernetes.io/ingress.class: contour - # kubernetes.io/tls-acme: "true" +siren-notification-worker: + image: + repository: odpf/siren + pullPolicy: Always + tag: latest + container: + args: + - worker + - start + - notification_handler + # livenessProbe: + # exec: + # command: + # - /bin/bash + # - -c + # - ps -ef | grep siren | grep -v grep + # initialDelaySeconds: 10 + # periodSeconds: 10 -service: - # -- Kubernetes service details - type: ClusterIP - # loadBalancerSourceRanges: - externalPort: 80 - internalPort: 3000 - # -- Used to fix NodePort when service.type: NodePort. - nodePort: - annotations: - {} - # Used to add custom annotations to the Service. - # service.beta.kubernetes.io/aws-load-balancer-internal: "0.0.0.0/0" + migration: + enabled: false -livenessProbe: - # -- Kubernetes liveness probe configs - httpGetPath: /ping - initialDelaySeconds: 120 - timeoutSeconds: 30 - failureThreshold: 6 + ingress: + enabled: false -readinessProbe: - # -- Kubernetes readiness probe configs - httpGetPath: /ping - initialDelaySeconds: 30 - timeoutSeconds: 3 - periodSeconds: 5 + config: + DB_DRIVER: postgres + NOTIFICATION_QUEUE_KIND: postgres + NOTIFICATION_MESSAGE_HANDLER_ENABLED: false + NOTIFICATION_MESSAGE_DLQ_HANDLER_ENABLED: false + + secretConfig: + DB_URL: postgres://postgres:@localhost:5432/siren?sslmode=disable + SERVICE_ENCRYPTION_KEY: ____STRING_OF_32_CHARACTERS_____ -resources: - # -- Kubernetes resource details - {} - # 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 - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi +siren-notification-dlq-worker: + image: + repository: odpf/siren + pullPolicy: Always + tag: latest + container: + args: + - worker + - start + - notification_dlq_handler + # livenessProbe: + # exec: + # command: + # - /bin/bash + # - -c + # - ps -ef | grep siren | grep -v grep + # initialDelaySeconds: 10 + # periodSeconds: 10 -## Node labels for pod assignment -## ref: https://kubernetes.io/docs/user-guide/node-selection/ -# -nodeSelector: {} + migration: + enabled: false -## Tolerations for pod assignment -## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ -## -tolerations: [] + ingress: + enabled: false + + config: + DB_DRIVER: postgres + NOTIFICATION_QUEUE_KIND: postgres + NOTIFICATION_MESSAGE_HANDLER_ENABLED: false + NOTIFICATION_MESSAGE_DLQ_HANDLER_ENABLED: false -## Affinity for pod assignment -## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity -## -affinity: {} + secretConfig: + DB_URL: postgres://postgres:@localhost:5432/siren?sslmode=disable + SERVICE_ENCRYPTION_KEY: ____STRING_OF_32_CHARACTERS_____ From 9379fca33c9d471de9521d58c32711b9c484c632 Mon Sep 17 00:00:00 2001 From: Muhammad Abduh Date: Wed, 16 Nov 2022 11:33:43 +0700 Subject: [PATCH 2/3] fix(siren): update chart deps --- stable/siren/Chart.yaml | 5 +++++ stable/siren/charts/app-0.4.2.tgz | Bin 5594 -> 0 bytes 2 files changed, 5 insertions(+) delete mode 100644 stable/siren/charts/app-0.4.2.tgz diff --git a/stable/siren/Chart.yaml b/stable/siren/Chart.yaml index 797ae4d2..4c52bd44 100644 --- a/stable/siren/Chart.yaml +++ b/stable/siren/Chart.yaml @@ -5,6 +5,11 @@ version: 0.1.0 appVersion: v0.5.0 home: https://github.com/odpf/siren dependencies: +- name: app + version: "0.4.2" + repository: "https://odpf.github.io/charts/" + alias: siren-app + condition: siren-app.enabled - name: app version: "0.4.2" repository: "https://odpf.github.io/charts/" diff --git a/stable/siren/charts/app-0.4.2.tgz b/stable/siren/charts/app-0.4.2.tgz deleted file mode 100644 index 700b5fe843f60412589feae885dd42208ed2365f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5594 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 From 6a7c82de735752008bd690354d5473257bed2a83 Mon Sep 17 00:00:00 2001 From: Muhammad Abduh Date: Wed, 16 Nov 2022 11:36:02 +0700 Subject: [PATCH 3/3] fix(siren): add helm ignore and remove Chart.lock --- stable/siren/.helmignore | 23 +++++++++++++++++++++++ stable/siren/Chart.lock | 9 --------- 2 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 stable/siren/.helmignore delete mode 100644 stable/siren/Chart.lock diff --git a/stable/siren/.helmignore b/stable/siren/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/stable/siren/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/stable/siren/Chart.lock b/stable/siren/Chart.lock deleted file mode 100644 index 3b0788eb..00000000 --- a/stable/siren/Chart.lock +++ /dev/null @@ -1,9 +0,0 @@ -dependencies: -- name: app - repository: https://odpf.github.io/charts/ - version: 0.4.2 -- name: app - repository: https://odpf.github.io/charts/ - version: 0.4.2 -digest: sha256:540f8f9e529268f3a792c15cc904e6db801f252a2e933d433dc96d7c46f06732 -generated: "2022-11-15T13:19:00.887767+07:00"