Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/guac/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ maintainers:
email: guac-info@kusari.dev

type: application
version: 0.7.0
appVersion: "v0.14.0"
version: 0.8.0
appVersion: "v1.0.1"

dependencies:
- name: nats
Expand Down
3 changes: 2 additions & 1 deletion charts/guac/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ This section contains parameters for configuring the different GUAC components.
| `guac.pubSubAddr` | String gocloud connection string for pubsub configured via https://gocloud.dev/howto/pubsub/ | `undefined` |
| `guac.collectorPublishToQueue` | Whether to publish ingestion message to pubsub queue | `true` |
| `guac.blobAddr` | gocloud connection string for blob store configured via https://gocloud.dev/howto/blob/ | `undefined` |
| `guac.customLabels` | Custom labels to apply to all GUAC resources | `{}` |
| `guac.additionalResources` | | `{}` |

### nats
Expand Down Expand Up @@ -312,7 +313,7 @@ For running the unit tests, install the unittest plugin.

To run unit tests

`helm unittest charts/guac -3`
`helm unittest charts/guac`

To run Helm chart-testing (ct) lint and install tests

Expand Down
5 changes: 5 additions & 0 deletions charts/guac/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,11 @@
"type": "object",
"description": "",
"default": {}
},
"customLabels": {
"type": "object",
"description": "custom labels for all resources",
"default": {}
}
}
},
Expand Down
12 changes: 12 additions & 0 deletions charts/guac/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ Create chart name and version as used by the chart label.
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
User defined labels
*/}}
{{- define "guac.common.labels" -}}
{{- if .Values.guac.customLabels -}}
{{- toYaml .Values.guac.customLabels }}
{{- end }}
{{- end }}

{{/*
Common labels
*/}}
Expand All @@ -45,6 +54,9 @@ helm.sh/chart: {{ include "guac.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.guac.customLabels }}
{{ toYaml .Values.guac.customLabels }}
{{- end }}
{{- end }}

{{/*
Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/cd-certifier-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.cdCertifier.name }}
app.kubernetes.io/component: {{ .Values.guac.cdCertifier.name }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/collectsub-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.collectSub.name }}
app.kubernetes.io/component: {{ .Values.guac.collectSub.name }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/depsdev-collector-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.depsDevCollector.name }}
app.kubernetes.io/component: {{ .Values.guac.depsDevCollector.name }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/graphql-server-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.graphqlServer.name }}
app.kubernetes.io/component: {{ .Values.guac.graphqlServer.name }}
spec:
Expand Down
2 changes: 2 additions & 0 deletions charts/guac/templates/guac-cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: guac-cm
labels:
{{- include "guac.labels" . | nindent 4 }}
data:
guac.yaml: |

Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/guacrest-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.restApi.name }}
app.kubernetes.io/component: {{ .Values.guac.restApi.name }}
spec:
Expand Down
3 changes: 2 additions & 1 deletion charts/guac/templates/ingest-guac-data-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ kind: ConfigMap
metadata:
name: {{ .Values.guac.sampleData.jobName }}
labels:
{{- include "guac.labels" . | nindent 4 }}
app.kubernetes.io/name: {{ .Values.guac.sampleData.jobName }}
app.kubernetes.io/component: {{ .Values.guac.sampleData.jobName }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
Expand Down Expand Up @@ -126,7 +127,7 @@ data:
echo running guacone collect...
time /tmp/guacone collect files ${SHARED_DATA}/guac-data/top-dh-sboms/zookeeper.json
# for d in guac-data/docs
# do
# do
# done


Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/ingestor-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.ingestor.name }}
app.kubernetes.io/component: {{ .Values.guac.ingestor.name }}
spec:
Expand Down
2 changes: 2 additions & 0 deletions charts/guac/templates/ingressroute.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ kind: IngressRoute
metadata:
name: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "guac.labels" . | nindent 4 }}
spec:
entryPoints:
{{- range .Values.guac.traefikIngressRoute.entryPoints }}
Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/oci-collector-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.ociCollector.name }}
app.kubernetes.io/component: {{ .Values.guac.ociCollector.name }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/osv-certifier-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.osvCertifier.name }}
app.kubernetes.io/component: {{ .Values.guac.osvCertifier.name }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/scorecard-certifier-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.scorecardCertifier.name }}
app.kubernetes.io/component: {{ .Values.guac.scorecardCertifier.name }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion charts/guac/templates/visualizer-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
labels:
{{- include "guac.selectorLabels" . | nindent 8 }}
{{- include "guac.labels" . | nindent 8 }}
app.kubernetes.io/name: {{ .Values.guac.visualizer.name }}
app.kubernetes.io/component: {{ .Values.guac.visualizer.name }}
spec:
Expand Down
2 changes: 2 additions & 0 deletions charts/guac/templates/visualizer-proxy-cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: visualizer-proxy-cm
labels:
{{- include "guac.labels" . | nindent 4 }}
data:
default.conf: |
server {
Expand Down
Loading