Removes unused values from helm chart #29
Conversation
Used in every hosted ce, discussed with Brian L https://opensciencegrid.atlassian.net/browse/OPS-363
Discussed with Brian L. No longer used. https://opensciencegrid.atlassian.net/browse/OPS-363
|
@brianhlin @matyasselmeci can one of you give this a look over? Particularly look at the slate section, I wasn't confident if there was still bits being used, I just kind of ripped out everything that referenced slate. Please give it a look over and let me know if there's things we need to keep but rename instead. |
|
Also is that _helpers.tpl file still used? |
|
@brianhlin can you give this another look over? Also don't merge yet, Jeff D had some concerns with the dashboard piece. Want to make sure he's okay with changes before merge |
|
FWIW, I added the dashboard piece based on what I thought what Miron wanted but he's decided to go in a separate direction wrt the dashboard. |
This chart isn't supporting slate, almost all ce are migrated from slate https://opensciencegrid.atlassian.net/browse/OPS-363
| labels: | ||
| app: osg-hosted-ce | ||
| instance: {{ .Values.Instance }} | ||
| release: {{ .Release.Name }} | ||
| app.kubernetes.io/part-of: {{ .Chart.Name }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| data: | ||
| 50-slate-scitokens.conf: |+ | ||
| 50-scitokens.conf: |+ |
There was a problem hiding this comment.
It's worth looking in the container to make sure there isn't anything hardcoded referencing this file
There was a problem hiding this comment.
So I searched here: https://github.com/search?q=repo%3Ahtcondor%2Fhtcondor-ce%20scitokens.conf&type=code
And here: https://github.com/search?q=repo%3Aopensciencegrid%2Fdocker-compute-entrypoint%20scitokens.conf&type=code
And don't see any reference at all to this. Is there somewhere else I'm supposed to check? Also what's the difference between that conf and this one: https://github.com/htcondor/htcondor-ce/blob/056e76af28d258db82dc895c0b6a82c02e765fa6/config/mapfiles.d/10-scitokens.conf
There was a problem hiding this comment.
Looks like we're good as the CE container images look at the entire mapfiles.d dir for mappings to determine which users need to be provisioned: https://github.com/opensciencegrid/docker-compute-entrypoint/blob/master/base/etc/osg/image-config.d/ce-common-startup
The default conf that you link is mostly intended for admins setting up their own local CE and notice that there aren't any uncommented lines. The entire mapfiles.d dir is parsed in alphanumeric order and concatenated together to get credential -> user mappings (the file that determines what's included is /etc/condor-ce/mapfiles.d).
You'll see this pattern used a lot for configuration, e.g. conf.d dirs, across different Linux applications.
What exactly does that helpers.tpl do? Like it seemed like that line I removed wasn't used right? |
|
|
I'm not sure, I just know for the part I removed, I haven't seen anything namespace related defined with slate-vo- prefix. In fact Looking through the helm chart and our helm release, I don't see anything set for a namespace so not sure where .Release.namespace is coming from, but I'm assuming it was removed at some point and this piece wasn't cleaned up? |
No description provided.