Node affinity

.github/workflows/repository.yml

@@ -3,9 +3,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - main
   release:
     types: [published, created]
 

README.md

@@ -1,20 +1,20 @@
 # Charts
-[Helm](https://github.com/helm/helm) Charts for Open Data Platform
+[Helm](https://github.com/helm/helm) Charts for Goto company ecosystem.
 
-Charts are curated application definitions for [Helm](https://github.com/helm/helm). Use this repository to submit official Open Data Platform helm Charts. For more information about installing and using Helm, see it's `README.md`.
+Charts are curated application definitions for [Helm](https://github.com/helm/helm). Use this repository to submit official Goto company helm Charts. For more information about installing and using Helm, see it's `README.md`.
 
 ## TL;DR
 
 ```bash
-$ helm repo add odpf https://odpf.github.io/charts/
-$ helm search repo odpf
-$ helm install my-release odpf/<chart>
+$ helm repo add gotocompany https://goto.github.io/charts/
+$ helm search repo gotocompany
+$ helm install my-release gotocompany/<chart>
 ```
 
 ## Repository Structure
 
-This repository contains the source for the packaged and versioned charts (released in the [Github Pages](https://odpf.github.io/charts/)).
-The Charts in the `stable/` directory in the main branch match the latest packaged Chart in the [Chart Repository](https://odpf.github.io/charts/).
+This repository contains the source for the packaged and versioned charts (released in the [Github Pages](https://goto.github.io/charts/)).
+The Charts in the `stable/` directory in the main branch match the latest packaged Chart in the [Chart Repository](https://goto.github.io/charts/).
 There may be previous versions of a Chart available in the Chart Repository.
 
 The purpose of this repository is to provide a place for maintaining and contributing official Charts, with CI processes in place for managing the releasing of Charts into the Chart Repository.
@@ -23,21 +23,21 @@ Stable Charts meet the criteria in the technical requirements.
 
 ## Usage
 
-Once you have installed the Helm client on your kubernetes cluster, you can deploy a ODPF Helm Chart into a Kubernetes cluster.
+Once you have installed the Helm client on your kubernetes cluster, you can deploy a Helm Chart into a Kubernetes cluster.
 
 Please refer to the [Quick Start guide](https://helm.sh/docs/intro/quickstart/) if you wish to get running in just a few commands, otherwise the [Using Helm Guide](https://helm.sh/docs/intro/using_helm/) provides detailed instructions on how to use the Helm client to manage packages on your Kubernetes cluster.
 
-Helm Repo URL: `https://odpf.github.io/charts/`
+Helm Repo URL: `https://goto.github.io/charts/`
 
 ```bash
-# To add ODPF Helm repo
-$ helm repo add odpf https://odpf.github.io/charts/
+# To add gotocompany Helm repo
+$ helm repo add gotocompany https://goto.github.io/charts/
 
 # To list all the charts in the repo
-$ helm search repo odpf
+$ helm search repo gotocompany
 
 # To install any searched chart
-$ helm install my-release odpf/<chart>
+$ helm install my-release gotocompany/<chart>
 ```
 
 ## Contributing a Chart

stable/app/Chart.yaml

@@ -15,4 +15,4 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.3
+version: 0.7.0

stable/app/README.md

@@ -17,11 +17,11 @@ This chart can be used for deploying any app on kubenetes using helm
 To install the chart with the release name `my-release` and image `siren`:
 
 ```bash
-$ helm install --name my-release . -f ./path-to/values.yaml --set image.repository=odpf/siren --set image.tag=latest --set ingress.enabled=true
+$ helm install --name my-release . -f ./path-to/values.yaml --set image.repository=gotocompany/siren --set image.tag=latest --set ingress.enabled=true
 
 ```
 
-The command deploys odpf/siren on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+The command deploys gotocompany/siren on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
 
 > **Tip**: List all releases using `helm list`
 
@@ -55,10 +55,12 @@ The following table lists the configurable parameters of the Siren chart and the
 | container.readinessProbe.httpGet.port | string | `"tcp"`                                                                                       |                                                                      |
 | cron.enabled                          | bool   | `false`                                                                                       |                                                                      |
 | cron.jobs[0].name                     | string | `""`                                                                                          |                                                                      |
+| cron.jobs[0].serviceAccountName       | string | `""`                                                                                          |                                                                      |
 | cron.jobs[0].command                  | string | `""`                                                                                          |                                                                      |
 | cron.jobs[0].args                     | string | `""`                                                                                          |                                                                      |
 | cron.jobs[0].schedule                 | string | `"0 0 * * *"`                                                                                 |                                                                      |
-| cron.jobs[0].restartPolicy            | string | `Never`                                                                                       |                                                                      |
+| cron.jobs[0].restartPolicy            | string | `Never`                                                                                       |    
+| cron.jobs[0].resources                 | object |                              {}
 | fullnameOverride                      | string | `""`                                                                                          |                                                                      |
 | image.pullPolicy                      | string | `"IfNotPresent"`                                                                              | Specify the docker image path/repository.                            |
 | image.repository                      | string | `nil`                                                                                         |                                                                      |

stable/app/templates/cron.yaml

@@ -2,11 +2,12 @@
 {{- $fullName := include "app.fullname" . -}}
 {{- $appLabels := include "app.labels" . -}}
 {{- $appSelectorLabels := include "app.selectorLabels" . -}}
+{{- $podLabels := .Values.podLabels }}
 {{- range $i, $job := .Values.cron.jobs }}
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: "{{ $fullName | trunc 24 }}-{{ $i }}-{{ $job.name | trunc 24}}"
+  name: "{{ ($fullName | trunc 24 | trimSuffix "-") }}-{{ $i }}-{{ ($job.name | trunc 24 | trimSuffix "-") }}"
   namespace: {{ $.Release.Namespace }}
   labels:
     {{- $appLabels | nindent 4 }}
@@ -18,22 +19,116 @@ spec:
       template:
         metadata:
           labels:
-        {{- $appSelectorLabels | nindent 12 }}
+            {{- $appSelectorLabels | nindent 12 }}
+            {{- with $podLabels }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
         spec:
+          {{- if $job.serviceAccountName }}
+          serviceAccountName: "{{ $job.serviceAccountName }}"
+          {{- end }}
+          {{- if $job.initContainers }}
+          initContainers:
+            {{- range $initContainer := $job.initContainers }}
+            - {{- toYaml $initContainer | nindent 14 }}
+            {{- end }}
+          {{- end }}
           containers:
             - name: {{ $job.name }}
               image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
               imagePullPolicy: {{ $.Values.image.pullPolicy }}
               command:
-              {{- toYaml $job.command | nindent 16 }}
+              {{- if $.Values.otelcollector.enabled }}
+                  - /bin/sh
+                  - -c
+                  - |
+                    {{ join " " $job.command }}
+                    pkill -SIGTERM otelcol-contrib
+              {{- else }}
+                {{- toYaml $job.command | nindent 16 }}
+              {{- end }}
               args:
               {{- toYaml $job.args | nindent 16 }}
               envFrom:
                 - configMapRef:
                     name: {{ $fullName }}
+                {{- if $.Values.secretConfig }}
                 - secretRef:
                     name: {{ $fullName }}-secret
+                {{- end }}
+              {{- if $job.volumeMounts }}
+              volumeMounts:
+                {{- toYaml $job.volumeMounts | nindent 16 }}
+              {{- end }}
+              resources:
+                {{- toYaml $job.resources | nindent 16 }}
+            {{- if $.Values.otelcollector.enabled }}
+            - name: otel-collector-sidecar
+              image: {{ $.Values.otelcollector.image }}
+              imagePullPolicy: IfNotPresent
+              args:
+                - "--config=/etc/otelcollector/config.yaml"
+              ports:
+              - containerPort: 1888
+                name: pprof
+                protocol: TCP
+              - containerPort: 8888
+                name: prometheusself
+                protocol: TCP
+              - containerPort: 8889
+                name: prometheus
+                protocol: TCP
+              - containerPort: 13133
+                name: healthcheck
+                protocol: TCP
+              - containerPort: 4317
+                name: otlpgrpcrecv
+                protocol: TCP
+              - containerPort: 4318
+                name: otlphttprecv
+                protocol: TCP
+              - containerPort: 55679
+                name: zpages
+                protocol: TCP
+              env:
+                - name: K8S_NODE_NAME
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: spec.nodeName
+                - name: K8S_POD_NAME
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.name
+                - name: K8S_POD_NAMESPACE
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.namespace
+                - name: K8S_POD_IP
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: status.podIP
+                - name: OTEL_RESOURCE_ATTRIBUTES
+                  value: |
+                    k8s.deployment.name={{ $job.name }},k8s.namespace.name=$(K8S_POD_NAMESPACE),k8s.node.name=$(K8S_NODE_NAME),k8s.pod.name=$(K8S_POD_NAME),k8s.pod.ip=$(K8S_POD_IP)
+              volumeMounts:
+                - name: otelcollector-conf
+                  mountPath: /etc/otelcollector/
+              {{- if $.Values.otelcollector.resources }}
+              resources:
+                {{- toYaml $.Values.otelcollector.resources | nindent 16 }}
+              {{- end }}
+          shareProcessNamespace: true
+          {{- end}}
           restartPolicy: {{ $job.restartPolicy }}
+          volumes:
+            {{- range $volume := $job.volumes }}
+            - {{- toYaml $volume | nindent 14 }}
+            {{- end }}
+            {{- if $.Values.otelcollector.enabled }}
+            - name: otelcollector-conf
+              configMap:
+                name: {{ $fullName }}-otelcollector
+            {{- end }}
 ---
 {{- end -}}
 {{- end -}}