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

fix: set keyFormat in controller ConfigMap #208

Merged
merged 5 commits into from
Nov 29, 2024
Merged

fix: set keyFormat in controller ConfigMap #208

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f263106
fix: set keyFormat in controller ConfigMap
NohaIhab Nov 25, 2024
707933d
Merge branch 'main' into kf-6542-fix-set-keyformat-for-storing-logs
NohaIhab Nov 25, 2024
93a5847
fix: use key-format config in context to render manifests
NohaIhab Nov 27, 2024
2beaaed
Revert "fix: use key-format config in context to render manifests"
NohaIhab Nov 28, 2024
a73490f
skip: multi-line string to avoid noqa
NohaIhab Nov 29, 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
2 changes: 2 additions & 0 deletions charms/argo-controller/src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

from components.pebble_component import (
ARGO_CONTROLLER_CONFIGMAP,
ARGO_KEYFORMAT,
METRICS_PORT,
ArgoControllerPebbleService,
)
Expand Down Expand Up @@ -154,6 +155,7 @@ def _context_callable(self):
f"{self.object_storage_relation.component.get_data()['port']}"
),
"kubelet_insecure": self.model.config["kubelet-insecure"],
"key_format": ARGO_KEYFORMAT,
}


Expand Down
1 change: 1 addition & 0 deletions charms/argo-controller/src/components/pebble_component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
logger = logging.getLogger(__name__)

ARGO_CONTROLLER_CONFIGMAP = "argo-workflow-controller-configmap"
ARGO_KEYFORMAT = "artifacts/{{workflow.name}}/{{workflow.creationTimestamp.Y}}/{{workflow.creationTimestamp.m}}/{{workflow.creationTimestamp.d}}/{{pod.name}}" # noqa E501
kimwnasptd marked this conversation as resolved.
Show resolved Hide resolved
EXECUTOR_IMAGE_CONFIG_NAME = "executor-image"
LIVENESS_PROBE_PORT = "6060"
METRICS_PORT = "9090"
Expand Down
2 changes: 2 additions & 0 deletions charms/argo-controller/src/templates/minio_configmap.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ data:
s3:
endpoint: {{ s3_minio_endpoint }}
bucket: {{ s3_bucket }}
# keyFormat defines how artifacts will be organized in a bucket.
keyFormat: {{ key_format }}
# insecure will disable TLS. Primarily used for minio installs not configured with TLS
insecure: {{ kubelet_insecure }}
accessKeySecret:
Expand Down
Loading