Skip to content

Commit

Permalink
feat: update charts
Browse files Browse the repository at this point in the history
  • Loading branch information
@ojaswa1942
ojaswa1942 committed Apr 10, 2024
1 parent 03eb424 commit 27ee8bd
Show file tree
Hide file tree
Showing 17 changed files with 504 additions and 310 deletions.
2 changes: 1 addition & 1 deletion code-analysis/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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.4
version: 0.1.5

# 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
Expand Down
113 changes: 13 additions & 100 deletions code-analysis/templates/andromeda.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,14 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.andromeda.serviceName }}
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
labels:
{{- range $key, $val := .Values.andromeda.serviceLabels }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
annotations:
{{- range $key, $val := .Values.andromeda.serviceAnnotations }}
{{ $key }}: {{ $val | quote }}
{{- end }}

spec:
type: {{ .Values.andromeda.serviceType }}
selector:
Expand All @@ -28,18 +23,6 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: privado-scanner-role
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
{{- end }}
rules:
- apiGroups: ["batch"]
resources:
Expand All @@ -64,18 +47,6 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: privado-scanner-rb
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
{{- end }}
subjects:
- kind: ServiceAccount
name: privado-scanner-sa
Expand All @@ -88,18 +59,6 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: privado-scanner-sa
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
{{- end }}
---
apiVersion: v1
kind: PersistentVolumeClaim
Expand All @@ -109,16 +68,6 @@ metadata:
{{- range $key, $val := .Values.andromeda.volumes.annotations }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.customAnnotations }}
{{- toYaml .Values.customAnnotations | nindent 4 }}
{{- end }}
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}

spec:
storageClassName: {{ .Values.andromeda.volumes.storageClass }} # for eks "gp2" -> default
accessModes:
Expand All @@ -137,16 +86,6 @@ metadata:
{{- range $key, $val := .Values.andromeda.volumes.annotations }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.customAnnotations }}
{{- toYaml .Values.customAnnotations | nindent 4 }}
{{- end }}
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}

spec:
storageClassName: {{ .Values.andromeda.volumes.storageClass }} # for eks "gp2" -> default
accessModes:
Expand All @@ -165,15 +104,6 @@ metadata:
{{- range $key, $val := .Values.andromeda.volumes.annotations }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.customAnnotations }}
{{- toYaml .Values.customAnnotations | nindent 4 }}
{{- end }}
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
spec:
storageClassName: {{ .Values.andromeda.volumes.storageClass }} # for eks "gp2" -> default
accessModes:
Expand All @@ -192,15 +122,6 @@ metadata:
{{- range $key, $val := .Values.andromeda.volumes.annotations }}
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.customAnnotations }}
{{- toYaml .Values.customAnnotations | nindent 4 }}
{{- end }}
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
spec:
storageClassName: {{ .Values.andromeda.volumes.storageClass }} # for eks "gp2" -> default
accessModes:
Expand All @@ -217,15 +138,13 @@ metadata:
name: {{ .Values.andromeda.deploymentName }}
labels:
app: andromeda
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{- toYaml .Values.customAnnotations | nindent 4 }}
{{- end }}
{{- end }}
{{- range $key, $val := .Values.andromeda.deploymentLabels }}
{{ $key }}: {{ $val | quote }}
{{- end }}
annotations:
{{- range $key, $val := .Values.andromeda.deploymentAnnotations }}
{{ $key }}: {{ $val | quote }}
{{- end }}
spec:
# deployment to pod mapping
replicas: {{ .Values.andromeda.replicas }}
Expand All @@ -237,16 +156,10 @@ spec:
metadata:
labels:
app: {{ .Values.andromeda.podAppLabel }}
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 8}}
{{- end }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum | quote }}
checksum/enterprise.conf: {{ include (print $.Template.BasePath "/config.andromeda-enterpise-conf.yaml") . | sha256sum | quote }}
checksum/nginx.conf: {{ include (print $.Template.BasePath "/config.andromeda-nginx-conf.yaml") . | sha256sum | quote }}
{{- if .Values.customAnnotations }}
{{- toYaml .Values.customAnnotations | nindent 8 }}
{{- end }}
spec:
imagePullSecrets:
- name: {{ .Values.base.imagePullSecret }}
Expand Down
40 changes: 14 additions & 26 deletions code-analysis/templates/bishamonten.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.bishamonten.serviceName }}
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
labels:
{{- range $key, $val := .Values.bishamonten.serviceLabels }}
{{ $key }}: {{ $val | quote }}
{{- end }}
annotations:
{{- range $key, $val := .Values.bishamonten.serviceAnnotations }}
{{ $key }}: {{ $val | quote }}
{{- end }}
spec:
type: {{ .Values.bishamonten.serviceType }}
Expand All @@ -29,15 +25,13 @@ metadata:
name: {{ .Values.bishamonten.deploymentName }}
labels:
app: bishamonten
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
{{- end }}
{{- range $key, $val := .Values.bishamonten.deploymentLabels }}
{{ $key }}: {{ $val | quote }}
{{- end }}
annotations:
{{- range $key, $val := .Values.bishamonten.deploymentAnnotations }}
{{ $key }}: {{ $val | quote }}
{{- end }}
spec:
# deployment to pod mapping
replicas: {{ .Values.bishamonten.replicas }}
Expand All @@ -49,14 +43,8 @@ spec:
metadata:
labels:
app: {{ .Values.bishamonten.podAppLabel }}
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 8}}
{{- end }}
annotations:
checksum/hostconfig: {{ include (print $.Template.BasePath "/config.bishamonten-hostconfig.yaml") . | sha256sum | quote }}
{{- if .Values.customAnnotations }}
{{- toYaml .Values.customAnnotations | nindent 8 }}
{{- end }}
spec:
imagePullSecrets:
- name: {{ .Values.base.imagePullSecret }}
Expand Down
12 changes: 0 additions & 12 deletions code-analysis/templates/config.andromeda-enterpise-conf.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: andromeda-enterprise-conf
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
{{- end }}
data:
enterprise.conf: |
_SERVER_NAME_={{ .Values.base.host | quote }}
Expand Down
12 changes: 0 additions & 12 deletions code-analysis/templates/config.andromeda-nginx-conf.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: andromeda-nginx-conf
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
{{- end }}
data:
andromeda-on-premise-enterprise.conf: |
geo $limited {
Expand Down
12 changes: 0 additions & 12 deletions code-analysis/templates/config.bishamonten-hostconfig.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Values.bishamonten.volumeHostConfig.configName }}
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
{{- end }}
data:
env.js: |
window.configuration = {
Expand Down
12 changes: 0 additions & 12 deletions code-analysis/templates/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Values.config.name }}
{{- if .Values.customLabels }}
labels:
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | nindent 4}}
{{- end }}
{{- end }}
{{- if .Values.customAnnotations }}
annotations:
{{- if .Values.customAnnotations }}
{{ toYaml .Values.customAnnotations | nindent 4}}
{{- end }}
{{- end }}
data:
MONGO_HOST: {{ .Values.mongo.statefulSetName }}-0.{{ .Values.mongo.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.base.clusterDomain }}
MONGODB_HOST: {{ .Values.mongo.statefulSetName }}-0.{{ .Values.mongo.serviceName }}.{{ .Release.Namespace }}.svc.{{ .Values.base.clusterDomain }}
Expand Down
Loading

0 comments on commit 27ee8bd

Please sign in to comment.