Adds support for enabling external configmaps

Author: ashtongraves

supported/osg-htc/osg-hosted-ce/Chart.yaml

@@ -3,4 +3,4 @@ apiVersion: v1
 appVersion: "V5-branch"
 description: OSG Hosted Compute Entrypoint
 name: osg-hosted-ce
-version: 4.9.0
+version: 4.10.0

supported/osg-htc/osg-hosted-ce/templates/configmap.yaml

@@ -71,6 +71,12 @@ data:
     TCP_FORWARDING_HOST = {{ .Values.Networking.RequestIP }}
 {{ end }}
 
+{{ if .Values.ExternalHTCondorCeConfig }}
+  {{- range .Values.ExternalHTCondorCeConfig }}
+    LOCAL_CONFIG_DIR = $(LOCAL_CONFIG_DIR),{{ .MountPath }}
+  {{- end}}
+{{ end }}
+
     SLATE_HOSTED_CE = True
     OSG_HOSTED_CE = True
     SCHEDD_ATTRS = $(SCHEDD_ATTRS) SLATE_HOSTED_CE OSG_HOSTED_CE

supported/osg-htc/osg-hosted-ce/templates/deployment.yaml

@@ -46,6 +46,13 @@ spec:
         persistentVolumeClaim:
           claimName: {{ .Values.Persistence.LibCondorCeVolume }}
       {{ end }}
+      {{ if .Values.ExternalHTCondorCeConfig }}
+      {{- range .Values.ExternalHTCondorCeConfig }}
+      - name: {{ .Name }}
+        configMap:
+          name: {{ .Name }}
+      {{- end }}
+      {{ end }}
       - name: osg-hosted-ce-{{ .Values.Instance }}-configuration
         configMap:
           name: osg-hosted-ce-{{ .Values.Instance }}-configuration
@@ -115,6 +122,15 @@ spec:
         - name: osg-hosted-ce-{{ .Values.Instance }}-configuration
           mountPath: /tmp/90-local.ini
           subPath: 90-local.ini
+        {{ if .Values.ExternalHTCondorCeConfig }}
+        {{- range .Values.ExternalHTCondorCeConfig }}
+        - name: {{ .Name }}
+          mountPath: {{ .MountPath }}
+          {{ if .SubPath }}
+          subPath: {{ .SubPath }}
+          {{ end }}
+        {{- end}}
+        {{ end }}
         - name: bosco-ssh-private-key-volume
           mountPath: /etc/osg/bosco.key
           subPath: bosco.key

supported/osg-htc/osg-hosted-ce/values.yaml

@@ -132,6 +132,13 @@ SciTokenRemoteUserMapping:
 # HTCondorCeConfig: |+
 #   ALL_DEBUG = D_ALWAYS:2 D_CAT
 
+# ExternalHTCondorCeConfig: 
+# - Name: k8s-ce-config
+#   MountPath: /etc/condor-ce/k8s-ce-config.d
+# - Name: ConfigTest
+#   MountPath: /etc/condor-ce/test
+#   SubPath: test.yaml
+
 # Specify additional osg-configure configuration
 # See https://github.com/opensciencegrid/osg-configure#35-pilotini--pilot
 # OsgConfigureConfig: |+