Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Guac v0.7.0 release #51

Merged
merged 4 commits into from
Jun 5, 2024
Merged

Guac v0.7.0 release #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa17730
bump version to 0.3.1
sunnyyip May 17, 2024
a971e0f
Merge branch 'main' of https://github.com/sunnyyip/helm-charts into g…
sunnyyip Jun 5, 2024
7244b23
guac v0.7.0 release
sunnyyip Jun 5, 2024
0b6db25
add no configmap test
sunnyyip Jun 5, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ maintainers:
email: [email protected]

type: application
version: 0.3.1
appVersion: "v0.6.0"
version: 0.4.0
appVersion: "v0.7.0"

dependencies:
- name: nats
Expand Down
2 changes: 2 additions & 0 deletions charts/guac/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ This section contains parameters for configuring the different GUAC components.
| `guac.guacImage.workingDir` | Working Directory for GUAC | `/guac` |
| `guac.common.env` | common environment variables apply to all guac services | `""` |
| `guac.common.tolerations` | common tolerations apply to all guac services | `""` |
| `guac.configMap.enabled` | Whether to create the guac-cm configMap | `true` |
| `guac.ociCollector.enabled` | String Whether to deploy OCI Collector | `true` |
| `guac.ociCollector.name` | String Name of the OCI Collector component. | `oci-collector` |
| `guac.ociCollector.annotations.reloader.stakater.com/auto` | Boolean for deploying [stakater/Reloader] (https://github.com/stakater/Reloader) | `""` |
Expand Down Expand Up @@ -233,6 +234,7 @@ This section contains parameters for configuring the different GUAC components.
| `guac.backend.ent.db-migrate` | Wether to automatically run database migrations on start | `true` |
| `guac.backend.ent.db-debug` | Enable debug logging for database queries | `true` |
| `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.additionalResources` | | `{}` |

Expand Down
15 changes: 15 additions & 0 deletions charts/guac/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@
}
}
},
"configMap": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean",
"description": "Whether to create the guac-cm configMap",
"default": true
}
}
},
"ociCollector": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -893,6 +903,11 @@
}
}
},
"collectorPublishToQueue": {
"type": "boolean",
"description": "Whether to publish ingestion message to pubsub queue",
"default": true
},
"additionalResources": {
"type": "object",
"description": "",
Expand Down
5 changes: 5 additions & 0 deletions charts/guac/templates/guac-cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ if .Values.guac.configMap.enabled }}
# Copyright Kusari, Inc. and contributors
# Licensed under the MIT license. See LICENSE file in the project root for details.
---
Expand All @@ -14,6 +15,8 @@ data:
pubsub-addr: nats://{{ .Release.Name }}-nats.{{ .Release.Namespace }}.svc.cluster.local:4222
{{- end }}

publish-to-queue: {{ $.Values.guac.collectorPublishToQueue }}

{{- if $.Values.guac.blobAddr }}
blob-addr: {{ $.Values.guac.blobAddr }}
{{- else }}
Expand Down Expand Up @@ -50,3 +53,5 @@ data:
{{ $key }}: {{ $val }}
{{- end }}
{{ end }}

{{ end }}
2 changes: 2 additions & 0 deletions charts/guac/templates/ingest-guac-data-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ data:
ls -la ${SHARED_DATA}/guac-data/docs
time /tmp/guaccollect files --service-poll=false ${SHARED_DATA}/guac-data/docs

sleep 3

echo running guacone collect...
time /tmp/guacone collect files ${SHARED_DATA}/guac-data/top-dh-sboms/zookeeper.json
# for d in guac-data/docs
Expand Down
13 changes: 13 additions & 0 deletions charts/guac/tests/configmap_no_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright Kusari, Inc. and contributors
# Licensed under the MIT license. See LICENSE file in the project root for details.
suite: No ConfigMap test
templates:
- guac-cm.yaml

tests:
- it: should not create ConfigMap
values:
- ./values_configmap_no.yaml
asserts:
- hasDocuments:
count: 0
6 changes: 6 additions & 0 deletions charts/guac/tests/values_configmap_no.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Copyright Kusari, Inc. and contributors
# Licensed under the MIT license. See LICENSE file in the project root for details.
guac:

configMap:
enabled: false
7 changes: 7 additions & 0 deletions charts/guac/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ imagePullSecrets:
## @param guac.guacImage.workingDir Working Directory for GUAC
## @param guac.common.env [string] common environment variables apply to all guac services
## @param guac.common.tolerations [string] common tolerations apply to all guac services
## @param guac.configMap.enabled Whether to create the guac-cm configMap
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not clear what the guac-cm config map is here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The configmap contains the guac cli flag values.

The variable here allow one to not create the configmap and pass the flags individually into respective guac component or create their own config map.

## @param guac.ociCollector.enabled String Whether to deploy OCI Collector
## @param guac.ociCollector.name String Name of the OCI Collector component.
## @param guac.ociCollector.annotations.reloader.stakater.com/auto [string] Boolean for deploying [stakater/Reloader] (https://github.com/stakater/Reloader)
Expand Down Expand Up @@ -146,6 +147,7 @@ imagePullSecrets:
## @param guac.backend.ent.db-migrate Wether to automatically run database migrations on start
## @param guac.backend.ent.db-debug Enable debug logging for database queries
## @param guac.pubSubAddr [nullable] String gocloud connection string for pubsub configured via https://gocloud.dev/howto/pubsub/
## @param guac.collectorPublishToQueue Whether to publish ingestion message to pubsub queue
## @param guac.blobAddr [nullable] gocloud connection string for blob store configured via https://gocloud.dev/howto/blob/
## @param guac.additionalResources
guac:
Expand All @@ -169,6 +171,9 @@ guac:
value: secretKey
tolerations: []

configMap:
enabled: true

ociCollector:
enabled: true
name: oci-collector
Expand Down Expand Up @@ -392,6 +397,8 @@ guac:
# e.g.
# pubSubAddr: awssqs://sqs.[aws_region].amazonaws.com/[account_id]/[queue_name]?region=[aws_region]

collectorPublishToQueue: true

# Default to use minio; specify a value here to override
# e.g.
# blobAddr: s3://[bucket_name]?region=[aws_region]
Expand Down
Loading