Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 68fcdbb924 |
@@ -15,4 +15,4 @@ type: library
|
||||
# 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.0
|
||||
version: 0.3.0
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{{- define "common.configmap.tpl" -}}
|
||||
{{- if .Values.vars }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{{- define "common.customFileConfigmap.tpl" -}}
|
||||
{{- range .Values.volumes }}
|
||||
{{- if .fileName }}
|
||||
---
|
||||
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ template "common.robustName" (printf "%s-%s" $.Release.Name .name) }}
|
||||
name: {{ template "common.robustName" .fileName }}
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
data:
|
||||
{{ .fileName }}: |
|
||||
|
||||
@@ -1,20 +1,10 @@
|
||||
{{- define "common.envFromRef.tpl" -}}
|
||||
{{- if or (or (or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName) .Values.existingConfigMaps) .Values.existingSecrets -}}
|
||||
{{- if or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName }}
|
||||
envFrom: &envFrom
|
||||
{{- if .Values.vars }}
|
||||
- configMapRef:
|
||||
name: {{ template "common.robustName" .Release.Name }}
|
||||
{{- end }}
|
||||
{{- range .Values.existingSecrets }}
|
||||
- secretRef:
|
||||
name: {{ .name }}
|
||||
optional: {{ .optional | default false }}
|
||||
{{- end }}
|
||||
{{- range .Values.existingConfigMaps }}
|
||||
- configMapRef:
|
||||
name: {{ .name }}
|
||||
optional: {{ .optional | default false }}
|
||||
{{- end }}
|
||||
{{- if .Values.secretEnabled }}
|
||||
- secretRef:
|
||||
name: {{ include "common.robustName" $.Release.Name }}
|
||||
@@ -28,4 +18,4 @@ envFrom: &envFrom
|
||||
name: {{ template "common.robustName" .Release.Name }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{{- define "common.volumeMountsRef.tpl" -}}
|
||||
{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}}
|
||||
{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets }}
|
||||
volumeMounts: &volumeMounts
|
||||
{{- range .Values.volumes }}
|
||||
{{- if not (hasPrefix "init-" .name) }}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{{- define "common.volumesRef.tpl" -}}
|
||||
{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}}
|
||||
{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets }}
|
||||
volumes:
|
||||
{{- range .Values.volumes }}
|
||||
- name: {{ .name }}
|
||||
@@ -10,7 +10,7 @@ volumes:
|
||||
name: {{ .existingConfigMap }}
|
||||
{{- else if .fileName }}
|
||||
configMap:
|
||||
name: {{ template "common.robustName" (printf "%s-%s" $.Release.Name .name) }}
|
||||
name: {{ template "common.robustName" .fileName }}
|
||||
{{- else if .hostPath }}
|
||||
hostPath:
|
||||
path: {{ .hostPath.path }}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
dependencies:
|
||||
- name: common
|
||||
repository: file://../common
|
||||
version: 0.4.0
|
||||
digest: sha256:d4eccd332ada7362f429e04b82022f5605a02e2d3aa7b9fdf8adaf4f6c9e03eb
|
||||
generated: "2023-10-20T10:53:13.982995773+02:00"
|
||||
version: 0.3.0
|
||||
digest: sha256:4f1fb49a840753587de0b15ccd8ae83f655fc8043d0a71a4cbec228365713b0d
|
||||
generated: "2023-06-08T16:30:30.656437+02:00"
|
||||
|
||||
@@ -15,9 +15,9 @@ 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.62.0
|
||||
version: 0.51.0
|
||||
|
||||
dependencies:
|
||||
- name: common
|
||||
version: 0.4.0
|
||||
version: 0.3.0
|
||||
repository: file://../common
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -25,12 +25,10 @@ spec:
|
||||
{{- if .Values.vars }}
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
{{- end }}
|
||||
{{- if .Values.overrideCommand }}
|
||||
command:
|
||||
- {{ .Values.shell }}
|
||||
- -c
|
||||
- {{ .Values.command | quote }}
|
||||
{{- end }}
|
||||
{{- include "common.envFromRef.tpl" . | nindent 14 }}
|
||||
{{- include "common.volumeMountsRef.tpl" . | nindent 14 }}
|
||||
resources:
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
{{- include "common.customFileConfigmap.tpl" . -}}
|
||||
@@ -5,7 +5,6 @@ image:
|
||||
schedule: "*/1 * * * *"
|
||||
command: |
|
||||
echo "I'm alive"
|
||||
overrideCommand: true
|
||||
shell: "/bin/sh"
|
||||
|
||||
nameOverride: ""
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
dependencies:
|
||||
- name: common
|
||||
repository: file://../common
|
||||
version: 0.4.0
|
||||
digest: sha256:d4eccd332ada7362f429e04b82022f5605a02e2d3aa7b9fdf8adaf4f6c9e03eb
|
||||
generated: "2023-10-20T10:52:47.237955041+02:00"
|
||||
version: 0.3.0
|
||||
digest: sha256:4f1fb49a840753587de0b15ccd8ae83f655fc8043d0a71a4cbec228365713b0d
|
||||
generated: "2023-06-08T16:30:30.052037+02:00"
|
||||
|
||||
@@ -15,9 +15,9 @@ 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.62.0
|
||||
version: 0.51.0
|
||||
|
||||
dependencies:
|
||||
- name: common
|
||||
version: 0.4.0
|
||||
version: 0.3.0
|
||||
repository: file://../common
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -142,33 +142,23 @@
|
||||
{
|
||||
"schemaIDs": [
|
||||
"#/properties/podDisruptionBudgetEnabled",
|
||||
"#/properties/spreadAcrossNodes",
|
||||
"#/properties/podAnnotations",
|
||||
"#/properties/podLabels"
|
||||
"#/properties/spreadAcrossNodes"
|
||||
],
|
||||
"uiSchema": {},
|
||||
"metaData": {
|
||||
"name": "Deployment fine-tuning",
|
||||
"name": "High Availability",
|
||||
"icon": "M9 12l2 2 4-4M7.835 4.697a3.42 3.42 0 001.946-.806 3.42 3.42 0 014.438 0 3.42 3.42 0 001.946.806 3.42 3.42 0 013.138 3.138 3.42 3.42 0 00.806 1.946 3.42 3.42 0 010 4.438 3.42 3.42 0 00-.806 1.946 3.42 3.42 0 01-3.138 3.138 3.42 3.42 0 00-1.946.806 3.42 3.42 0 01-4.438 0 3.42 3.42 0 00-1.946-.806 3.42 3.42 0 01-3.138-3.138 3.42 3.42 0 00-.806-1.946 3.42 3.42 0 010-4.438 3.42 3.42 0 00.806-1.946 3.42 3.42 0 013.138-3.138z"
|
||||
}
|
||||
},
|
||||
{
|
||||
"schemaIDs": [
|
||||
"#/properties/name",
|
||||
"#/properties/description",
|
||||
"#/properties/ownerName",
|
||||
"#/properties/ownerIm",
|
||||
"#/properties/podAnnotations",
|
||||
"#/properties/gitSha",
|
||||
"#/properties/gitRepository",
|
||||
"#/properties/documentation",
|
||||
"#/properties/logs",
|
||||
"#/properties/metrics",
|
||||
"#/properties/traces",
|
||||
"#/properties/issues"
|
||||
"#/properties/gitRepository"
|
||||
],
|
||||
"uiSchema": {},
|
||||
"metaData": {
|
||||
"name": "Service Catalog",
|
||||
"name": "Misc",
|
||||
"icon": "M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,9 +39,6 @@ spec:
|
||||
gimlet.io/git-repository: {{ .Values.gitRepository }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- with .Values.podLabels }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- include "helm-chart.selectorLabels" . | nindent 8 }}
|
||||
spec:
|
||||
{{- with .Values.imagePullSecrets }}
|
||||
@@ -66,15 +63,11 @@ spec:
|
||||
{{- end }}
|
||||
volumeMounts:
|
||||
{{- range $.Values.volumes }}
|
||||
{{- if (or (hasPrefix "shared-" .name) (hasPrefix "init-" .name))}}
|
||||
{{if (or (hasPrefix "shared-" .name) (hasPrefix "init-" .name))}}
|
||||
- mountPath: {{ .path }}
|
||||
name: {{ .name }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .securityContext }}
|
||||
securityContext:
|
||||
{{- toYaml .securityContext | nindent 12 }}
|
||||
{{- end}}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ template "robustName" .Release.Name }}
|
||||
@@ -94,7 +87,7 @@ spec:
|
||||
- name: http
|
||||
containerPort: {{ .Values.containerPort }}
|
||||
protocol: TCP
|
||||
{{- else }}
|
||||
{{ else }}
|
||||
{{- range .Values.ports }}
|
||||
- name: {{ .name }}
|
||||
containerPort: {{ .containerPort }}
|
||||
@@ -141,7 +134,7 @@ spec:
|
||||
- -c
|
||||
- {{ .Values.sidecar.command | quote }}
|
||||
{{- end }}
|
||||
{{- if or (or (or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName) .Values.existingConfigMaps) .Values.existingSecrets }}
|
||||
{{- if or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets }}
|
||||
envFrom: *envFrom
|
||||
{{- end }}
|
||||
{{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }}
|
||||
|
||||
@@ -5,44 +5,13 @@ metadata:
|
||||
namespace: {{ .Release.Namespace }}
|
||||
labels:
|
||||
{{- include "helm-chart.labels" . | nindent 4 }}
|
||||
{{- if or (or (or (or (or .Values.gitRepository .Values.gitSha) .Values.serviceName) .Values.serviceDescription) .Values.ownerName) .Values.ownerIm }}
|
||||
{{- if or .Values.gitRepository .Values.gitSha }}
|
||||
annotations:
|
||||
{{- if .Values.gitRepository }}
|
||||
gimlet.io/git-repository: {{ .Values.gitRepository }}
|
||||
{{- $parts := split "/" .Values.gitRepository }}
|
||||
v1alpha1.opensca.dev/vcs.owner: {{ $parts._0 }}
|
||||
v1alpha1.opensca.dev/vcs.name: {{ $parts._1 }}
|
||||
{{- end }}
|
||||
{{- if .Values.gitSha }}
|
||||
gimlet.io/git-sha: {{ .Values.gitSha }}
|
||||
v1alpha1.opensca.dev/version.sha: {{ .Values.gitSha }}
|
||||
{{- end }}
|
||||
{{- if .Values.serviceName }}
|
||||
v1alpha1.opensca.dev/name: {{ .Values.serviceName | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.serviceDescription }}
|
||||
v1alpha1.opensca.dev/description: {{ .Values.serviceDescription | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.ownerName }}
|
||||
v1alpha1.opensca.dev/owner.name: {{ .Values.ownerName | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.ownerIm }}
|
||||
v1alpha1.opensca.dev/owner.im: {{ .Values.ownerIm | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.documentation }}
|
||||
v1alpha1.opensca.dev/documentation: {{ .Values.documentation | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.logs }}
|
||||
v1alpha1.opensca.dev/logs: {{ .Values.logs | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.metrics }}
|
||||
v1alpha1.opensca.dev/metrics: {{ .Values.metrics | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.issues }}
|
||||
v1alpha1.opensca.dev/issues: {{ .Values.issues | quote }}
|
||||
{{- end }}
|
||||
{{- if .Values.traces }}
|
||||
v1alpha1.opensca.dev/traces: {{ .Values.traces | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
spec:
|
||||
@@ -62,7 +31,7 @@ spec:
|
||||
{{- if .Values.nodePort }}
|
||||
nodePort: {{ .Values.nodePort }}
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
{{ else }}
|
||||
{{- range .Values.ports }}
|
||||
- name: {{ .name }}
|
||||
port: {{ if .svcPort }}{{ .svcPort }}{{ else }}{{ .containerPort }}{{ end }}
|
||||
|
||||
@@ -16,23 +16,5 @@ tests:
|
||||
name: release-name
|
||||
- it: Should not reference configmap if vars are not set
|
||||
asserts:
|
||||
- isNull:
|
||||
path: spec.template.spec.containers[0].envFrom
|
||||
|
||||
- it: Should reference to existing configmaps
|
||||
set:
|
||||
existingConfigMaps:
|
||||
- name: firstcm
|
||||
optional: true
|
||||
- name: secondcm
|
||||
optional: true
|
||||
asserts:
|
||||
- contains:
|
||||
- isNull:
|
||||
path: spec.template.spec.containers[0].envFrom
|
||||
content:
|
||||
configMapRef:
|
||||
name: firstcm
|
||||
optional: true
|
||||
configMapRef:
|
||||
name: secondcm
|
||||
optional: true
|
||||
|
||||
@@ -26,13 +26,6 @@ tests:
|
||||
- equal:
|
||||
path: spec.template.spec.initContainers[0].command
|
||||
value: ['/bin/sh', '-c', 'while true; do date; sleep 2; done && ls /data && printf something']
|
||||
|
||||
- it: Should set security context
|
||||
set:
|
||||
initContainers:
|
||||
- securityContext:
|
||||
runAsNonRoot: true
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.template.spec.initContainers[0].securityContext.runAsNonRoot
|
||||
value: true
|
||||
|
||||
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
suite: test deployment
|
||||
templates:
|
||||
- deployment.yaml
|
||||
- configmap.yaml
|
||||
tests:
|
||||
- it: Should set custom labels
|
||||
set:
|
||||
podLabels:
|
||||
label1: val1
|
||||
label2: val2
|
||||
asserts:
|
||||
- equal:
|
||||
path: spec.template.metadata.labels.label1
|
||||
value: val1
|
||||
- equal:
|
||||
path: spec.template.metadata.labels.label2
|
||||
value: val2
|
||||
@@ -31,20 +31,3 @@ tests:
|
||||
content:
|
||||
secretRef:
|
||||
name: release-name
|
||||
- it: Should reference to existing secrets
|
||||
set:
|
||||
existingSecrets:
|
||||
- name: firstsecret
|
||||
optional: true
|
||||
- name: secondsecret
|
||||
optional: true
|
||||
asserts:
|
||||
- contains:
|
||||
path: spec.template.spec.containers[0].envFrom
|
||||
content:
|
||||
secretRef:
|
||||
name: firstsecret
|
||||
optional: true
|
||||
secretRef:
|
||||
name: secondsecret
|
||||
optional: true
|
||||
|
||||
@@ -169,7 +169,7 @@ tests:
|
||||
value:
|
||||
- name: volume-name
|
||||
configMap:
|
||||
name: release-name-volume-name
|
||||
name: myfile-conf
|
||||
- equal:
|
||||
path: spec.template.spec.containers[0].volumeMounts
|
||||
value:
|
||||
|
||||
@@ -4,32 +4,11 @@ templates:
|
||||
tests:
|
||||
- it: Should set Gimlet taxonomy
|
||||
set:
|
||||
gitRepository: laszlocph/demo-app
|
||||
gitRepository: github.com/laszlocph/demo-app
|
||||
gitSha: xyz
|
||||
serviceName: cart-backend
|
||||
serviceDescription: "Backend to manage shopping cart state, written in Go"
|
||||
ownerName: "backend-team"
|
||||
ownerIm: "#backend-team"
|
||||
documentation: https://confluence.mycompany.com/cart-backend
|
||||
logs: https://grafana.mycompany.com/logs
|
||||
metrics: https://grafana.mycompany.com/cart-dashboard
|
||||
issues: https://jira.mycompany.com/cart-backend
|
||||
traces: https://jaeger.mycompany.com/cart-dashboard
|
||||
asserts:
|
||||
- equal:
|
||||
path: metadata.annotations
|
||||
value:
|
||||
gimlet.io/git-repository: laszlocph/demo-app
|
||||
gimlet.io/git-repository: github.com/laszlocph/demo-app
|
||||
gimlet.io/git-sha: xyz
|
||||
v1alpha1.opensca.dev/vcs.owner: laszlocph
|
||||
v1alpha1.opensca.dev/vcs.name: demo-app
|
||||
v1alpha1.opensca.dev/version.sha: xyz
|
||||
v1alpha1.opensca.dev/name: cart-backend
|
||||
v1alpha1.opensca.dev/description: "Backend to manage shopping cart state, written in Go"
|
||||
v1alpha1.opensca.dev/owner.name: "backend-team"
|
||||
v1alpha1.opensca.dev/owner.im: "#backend-team"
|
||||
v1alpha1.opensca.dev/documentation: https://confluence.mycompany.com/cart-backend
|
||||
v1alpha1.opensca.dev/logs: https://grafana.mycompany.com/logs
|
||||
v1alpha1.opensca.dev/metrics: https://grafana.mycompany.com/cart-dashboard
|
||||
v1alpha1.opensca.dev/issues: https://jira.mycompany.com/cart-backend
|
||||
v1alpha1.opensca.dev/traces: https://jaeger.mycompany.com/cart-dashboard
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
"nameOverride": "",
|
||||
"fullnameOverride": "",
|
||||
"podAnnotations": {},
|
||||
"podLabels": {},
|
||||
"podSecurityContext": {
|
||||
"fsGroup": 999
|
||||
},
|
||||
@@ -190,81 +189,6 @@
|
||||
"required": [],
|
||||
"additionalProperties": true
|
||||
},
|
||||
"podLabels": {
|
||||
"$id": "#/properties/podLabels",
|
||||
"type": "object",
|
||||
"title": "Pod labels",
|
||||
"description": "Labels to place on pods",
|
||||
"default": {},
|
||||
"examples": [
|
||||
{}
|
||||
],
|
||||
"required": [],
|
||||
"additionalProperties": true
|
||||
},
|
||||
"name": {
|
||||
"$id": "#/properties/name",
|
||||
"type": "string",
|
||||
"title": "Service Name",
|
||||
"description": "The service name for unique identification",
|
||||
"default": ""
|
||||
},
|
||||
"description": {
|
||||
"$id": "#/properties/description",
|
||||
"type": "string",
|
||||
"title": "Service Description",
|
||||
"description": "Human readable text description of the service",
|
||||
"default": ""
|
||||
},
|
||||
"ownerName": {
|
||||
"$id": "#/properties/ownerName",
|
||||
"type": "string",
|
||||
"title": "Owner",
|
||||
"description": "The person or team who is responsible for this service",
|
||||
"default": ""
|
||||
},
|
||||
"ownerIm": {
|
||||
"$id": "#/properties/ownerIm",
|
||||
"type": "string",
|
||||
"title": "Owner IM",
|
||||
"description": "Instant messaging channel, or direct message handle of the owner. prefix with # for channels, prefix with @ for direct messages.",
|
||||
"default": ""
|
||||
},
|
||||
"documentation": {
|
||||
"$id": "#/properties/documentation",
|
||||
"type": "string",
|
||||
"title": "Link to Documentation",
|
||||
"description": "Link to documentation. The link's preferred usage is in a href html tag.",
|
||||
"default": ""
|
||||
},
|
||||
"logs": {
|
||||
"$id": "#/properties/logs",
|
||||
"type": "string",
|
||||
"title": "Link to Logs",
|
||||
"description": "Link to log aggregation platform. The link's preferred usage is in a href html tag.",
|
||||
"default": ""
|
||||
},
|
||||
"metrics": {
|
||||
"$id": "#/properties/metrics",
|
||||
"type": "string",
|
||||
"title": "Link to Metrics",
|
||||
"description": "Link to metrics dashboard. The link's preferred usage is in a href html tag.",
|
||||
"default": ""
|
||||
},
|
||||
"issues": {
|
||||
"$id": "#/properties/issues",
|
||||
"type": "string",
|
||||
"title": "Link to Issues",
|
||||
"description": "Link to issue tracker. The link's preferred usage is in a href html tag.",
|
||||
"default": ""
|
||||
},
|
||||
"traces": {
|
||||
"$id": "#/properties/traces",
|
||||
"type": "string",
|
||||
"title": "Link to Traces",
|
||||
"description": "Link to application traces. The link's preferred usage is in a href html tag.",
|
||||
"default": ""
|
||||
},
|
||||
"gitSha": {
|
||||
"$id": "#/properties/gitSha",
|
||||
"type": "string",
|
||||
|
||||
@@ -20,8 +20,6 @@ fullnameOverride: ""
|
||||
|
||||
podAnnotations: {}
|
||||
|
||||
podLabels: {}
|
||||
|
||||
podSecurityContext:
|
||||
fsGroup: 999
|
||||
|
||||
@@ -41,6 +39,7 @@ nodeSelector: {}
|
||||
|
||||
tolerations: []
|
||||
|
||||
|
||||
probe:
|
||||
enabled: false
|
||||
path: "/"
|
||||
|
||||
@@ -14,5 +14,5 @@ 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.62.0
|
||||
version: 0.51.0
|
||||
|
||||
|
||||
@@ -5,15 +5,6 @@ metadata:
|
||||
namespace: {{ .Release.Namespace }}
|
||||
labels:
|
||||
{{- include "staticSite.labels" . | nindent 4 }}
|
||||
{{- if or .Values.gitRepository .Values.gitSha }}
|
||||
annotations:
|
||||
{{- if .Values.gitRepository }}
|
||||
gimlet.io/git-repository: {{ .Values.gitRepository }}
|
||||
{{- end }}
|
||||
{{- if .Values.gitSha }}
|
||||
gimlet.io/git-sha: {{ .Values.gitSha }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
spec:
|
||||
replicas: {{ .Values.replicaCount }}
|
||||
selector:
|
||||
@@ -32,9 +23,7 @@ spec:
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- if .Values.serviceAccount }}
|
||||
serviceAccountName: {{ .Values.serviceAccount }}
|
||||
{{- end }}
|
||||
serviceAccountName: {{ template "robustName" .Release.Name }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
||||
volumes:
|
||||
|
||||
@@ -2,18 +2,8 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ template "robustName" .Release.Name }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
labels:
|
||||
{{- include "staticSite.labels" . | nindent 4 }}
|
||||
{{- if or .Values.gitRepository .Values.gitSha }}
|
||||
annotations:
|
||||
{{- if .Values.gitRepository }}
|
||||
gimlet.io/git-repository: {{ .Values.gitRepository }}
|
||||
{{- end }}
|
||||
{{- if .Values.gitSha }}
|
||||
gimlet.io/git-sha: {{ .Values.gitSha }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
spec:
|
||||
type: {{ .Values.service.type }}
|
||||
ports:
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
{{- if .Values.serviceAccount.create -}}
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ template "robustName" .Release.Name }}
|
||||
labels:
|
||||
{{- include "staticSite.labels" . | nindent 4 }}
|
||||
{{- with .Values.serviceAccount.annotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
@@ -25,21 +25,21 @@
|
||||
"type": "string",
|
||||
"title": "Repo url",
|
||||
"description": "The static site's git repository",
|
||||
"default": "https://github.com/gimlet-io/reactjs-test-app.git"
|
||||
"default": "https://github.com/gimlet-io/hugo-site.git"
|
||||
},
|
||||
"buildImage": {
|
||||
"$id": "#/properties/buildImage",
|
||||
"type": "string",
|
||||
"title": "Build image",
|
||||
"description": "The image that will be used for the build proccess",
|
||||
"default": "node:latest"
|
||||
"default": "bitnami/git:latest"
|
||||
},
|
||||
"buildScript": {
|
||||
"$id": "#/properties/buildScript",
|
||||
"type": "string",
|
||||
"title": "Build script",
|
||||
"description": "Commands required for the build to be completed",
|
||||
"default": "# !/usr/bin/env bash\n\nnpm install\nnpm run build"
|
||||
"default": "# !/usr/bin/env bash\n# pre -reqs\napt-get update && apt-get install -y wget\n\n# Setting up Hugo \nwget https://github.com/gohugoio/hugo/releases/download/v0.111.3/hugo_0.111.3_Linux-64bit.tar.gz &&\ntar -xzf hugo_0.111.3_Linux-64bit.tar.gz &&\nchmod +x hugo\n\n./hugo"
|
||||
|
||||
},
|
||||
"builtAssets": {
|
||||
@@ -47,7 +47,7 @@
|
||||
"type": "string",
|
||||
"title": "Built assets",
|
||||
"description": "The folder containing the build's generated files",
|
||||
"default": "build/"
|
||||
"default": "public/"
|
||||
},
|
||||
"ingress": {
|
||||
"$id": "#/properties/ingress",
|
||||
|
||||
@@ -13,6 +13,15 @@ imagePullSecrets: []
|
||||
nameOverride: ""
|
||||
fullnameOverride: ""
|
||||
|
||||
serviceAccount:
|
||||
# Specifies whether a service account should be created
|
||||
create: true
|
||||
# Annotations to add to the service account
|
||||
annotations: {}
|
||||
# The name of the service account to use.
|
||||
# If not set and create is true, a name is generated using the fullname template
|
||||
name: ""
|
||||
|
||||
podAnnotations: {}
|
||||
|
||||
podSecurityContext: {}
|
||||
@@ -53,8 +62,17 @@ tolerations: []
|
||||
affinity: {}
|
||||
|
||||
# values to build and deploy static sites
|
||||
gitCloneUrl: https://github.com/gimlet-io/reactjs-test-app.git
|
||||
buildImage: "node:latest"
|
||||
gitCloneUrl: https://github.com/gimlet-io/hugo-site.git
|
||||
buildImage: bitnami/git:latest # the image must have git installed
|
||||
buildScript: |
|
||||
npm install && npm run build
|
||||
builtAssets: build/
|
||||
# !/usr/bin/env bash
|
||||
# pre -reqs
|
||||
apt-get update && apt-get install -y wget
|
||||
|
||||
# Setting up Hugo
|
||||
wget https://github.com/gohugoio/hugo/releases/download/v0.111.3/hugo_0.111.3_Linux-64bit.tar.gz &&
|
||||
tar -xzf hugo_0.111.3_Linux-64bit.tar.gz &&
|
||||
chmod +x hugo
|
||||
|
||||
./hugo
|
||||
builtAssets: public/
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+103
-501
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+4
-6
@@ -2,9 +2,11 @@ ingress:
|
||||
host: chart-example.local
|
||||
ingressClassName: nginx
|
||||
|
||||
gitRepository: laszlocph/demo-app
|
||||
gitRepository: github.com/laszlocph/demo-app
|
||||
gitSha: xyz
|
||||
|
||||
vars:
|
||||
MY_VAR: "value"
|
||||
|
||||
volumes:
|
||||
- name: testing
|
||||
@@ -13,8 +15,4 @@ volumes:
|
||||
path: /deleteme
|
||||
- name: empty
|
||||
path: /deleteme2
|
||||
emptyDir: true
|
||||
|
||||
vars:
|
||||
var1: value1
|
||||
var2: value2
|
||||
emptyDir: true
|
||||
Reference in New Issue
Block a user