Merge branch 'infisical-radar-app' into main

helm-charts/infisical/Chart.yaml

@@ -7,7 +7,7 @@ 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.1.17
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm-charts/infisical/templates/_helpers.tpl

@@ -51,6 +51,16 @@ component: {{ .Values.frontend.name | quote }}
 {{ include "infisical.common.matchLabels" . }}
 {{- end -}}
 
+{{- define "infisical.secretScanningGitApp.labels" -}}
+{{ include "infisical.secretScanningGitApp.matchLabels" . }}
+{{ include "infisical.common.metaLabels" . }}
+{{- end -}}
+
+{{- define "infisical.secretScanningGitApp.matchLabels" -}}
+component: {{ .Values.secretScanningGitApp.name | quote }}
+{{ include "infisical.common.matchLabels" . }}
+{{- end -}}
+
 {{- define "infisical.mongodb.labels" -}}
 {{ include "infisical.mongodb.matchLabels" . }}
 {{ include "infisical.common.metaLabels" . }}
@@ -112,6 +122,24 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 {{- end -}}
 
+
+{{/*
+Create a fully qualified secretScanningGitApp name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "infisical.secretScanningGitApp.fullname" -}}
+{{- if .Values.secretScanningGitApp.fullnameOverride -}}
+{{- .Values.secretScanningGitApp.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- printf "%s-%s" .Release.Name .Values.secretScanningGitApp.name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s-%s" .Release.Name $name .Values.secretScanningGitApp.name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create the mongodb connection string.
 */}}

helm-charts/infisical/templates/ingress.yaml

@@ -44,6 +44,13 @@ spec:
               name: {{ include "infisical.backend.fullname" . }}
               port:
                 number: 4000
+        - path: {{ $ingress.secretScanningGitApp.path }}
+          pathType: {{ $ingress.secretScanningGitApp.pathType }}
+          backend:
+            service:
+              name: {{ include "infisical.secretScanningGitApp.fullname" . }}
+              port:
+                number: 3001
       {{- if $ingress.hostName }}
       host: {{ $ingress.hostName }}
       {{- end }}

helm-charts/infisical/templates/secret-scanning-git-app-deployment.yaml

@@ -0,0 +1,69 @@
+{{- $secretScanningGitApp := .Values.secretScanningGitApp }}
+{{- $backend := .Values.backend }}
+{{- if .Values.secretScanningGitApp.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "infisical.secretScanningGitApp.fullname" . }}
+  annotations:
+    updatedAt: {{ now | date "2006-01-01 MST 15:04:05" | quote }}
+    {{- with $secretScanningGitApp.deploymentAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  labels:
+    {{- include "infisical.secretScanningGitApp.labels" . | nindent 4 }}
+spec:
+  replicas: {{ $secretScanningGitApp.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "infisical.secretScanningGitApp.matchLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "infisical.secretScanningGitApp.matchLabels" . | nindent 8 }}
+      annotations:
+        updatedAt: {{ now | date "2006-01-01 MST 15:04:05" | quote }}
+        {{- with $secretScanningGitApp.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      containers:
+      - name: {{ template "infisical.name" . }}-{{ $secretScanningGitApp.name }}
+        image: "{{ $secretScanningGitApp.image.repository }}:{{ $secretScanningGitApp.image.tag | default "latest" }}"
+        imagePullPolicy: {{ $secretScanningGitApp.image.pullPolicy }}
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 3000
+          initialDelaySeconds: 10
+          periodSeconds: 10
+        ports: 
+        - containerPort: 3000
+        envFrom:
+        - secretRef:
+            name: {{ $backend.kubeSecretRef | default (include "infisical.backend.fullname" .) }} 
+{{- end }}        
+---
+{{- if .Values.secretScanningGitApp.enabled }}
+apiVersion: v1
+kind: Service 
+metadata:
+  name: {{ include "infisical.secretScanningGitApp.fullname" . }}
+  labels:
+    {{- include "infisical.secretScanningGitApp.labels" . | nindent 4 }}
+  {{- with $secretScanningGitApp.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  type: {{ $secretScanningGitApp.service.type }}
+  selector:
+    {{- include "infisical.secretScanningGitApp.matchLabels" . | nindent 8 }}
+  ports:
+    - protocol: TCP
+      port: 3001
+      targetPort: 3000 # container port 
+      {{- if eq $secretScanningGitApp.service.type "NodePort" }}
+      nodePort: {{ $secretScanningGitApp.service.nodePort }}
+      {{- end }}
+{{- end }}  

helm-charts/infisical/values.yaml

@@ -169,6 +169,53 @@ backendEnvironmentVariables:
   ##
   MONGO_URL: ""
 
+secretScanningGitApp:
+  ## @param backend.enabled Enable git scanning app
+  ##
+  enabled: false
+  ## @param backend.name Backend name
+  ##
+  name: secret-scanning-git-app
+  ## @param backend.fullnameOverride Backend fullnameOverride
+  ##
+  fullnameOverride: ""
+  ## @param backend.podAnnotations Backend pod annotations
+  ##
+  podAnnotations: {}
+  ## @param backend.deploymentAnnotations Backend deployment annotations
+  ##
+  deploymentAnnotations: {}
+  ## @param backend.replicaCount Backend replica count
+  ##
+  replicaCount: 2
+  ## Backend image parameters
+  ##
+  image:
+    ## @param backend.image.repository Backend image repository
+    ##
+    repository: infisical/staging_deployment_secret-scanning-git-app
+    ## @param backend.image.tag Backend image tag
+    ##
+    tag: "latest"
+    ## @param backend.image.pullPolicy Backend image pullPolicy
+    ##
+    pullPolicy: IfNotPresent
+  ## @param backend.kubeSecretRef Backend secret resource reference name (containing required [backend configuration variables](https://infisical.com/docs/self-hosting/configuration/envars))
+  ##
+  kubeSecretRef: ""
+  ## Backend service
+  ##
+  service:
+    ## @param backend.service.annotations Backend service annotations
+    ##
+    annotations: {}
+    ## @param backend.service.type Backend service type
+    ##
+    type: ClusterIP
+    ## @param backend.service.nodePort Backend service nodePort (used if above type is `NodePort`)
+    ##
+    nodePort: ""
+
 ## @section MongoDB(®) parameters
 ## Documentation : https://github.com/bitnami/charts/blob/main/bitnami/mongodb/values.yaml
 ##
@@ -327,6 +374,11 @@ ingress:
   backend:
     path: /api
     pathType: Prefix
+  ## @skip ingress.backend
+  ##
+  secretScanningGitApp:
+    path: /git-app-api
+    pathType: Prefix
   ## @param ingress.tls Ingress TLS hosts (matching above hostName)
   ## Replace with your own domain
   ##