Merge branch 'expose_hsi_data_mover_ports' into 'master' (705ab900) · Commits · ARM / k8s / ADL

.gitlab-ci.yml

+3 −3

Original line number	Diff line number	Diff line
		@@ -100,11 +100,11 @@ stop_review:
		url: https://$PROJECT_NAME-$CI_BUILD_REF_SLUG.k8s.arm.gov/docs
		action: stop
		image: camden.ornl.gov/hub_proxy/alpine/helm:latest
		when: manual
		only:
		- pipelines
		tags:
		- arm-k8s
		rules:
		- if: $CI_MERGE_REQUEST_IID
		when: manual
		script: helm delete $PROJECT_NAME-$CI_BUILD_REF_SLUG -n adl-review

		deploy:prod:

+4 −4

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ PFTP Client = {
		; Port range for firewalls. This is identical to RPC_RESTRICTED_PORTS
		; on most of our DCE systems.
		;
		PortRange = ncadg_ip_udp[10100-12100]:ncadg_ip_tcp[10100-12100]
		; PortRange = ncadg_ip_udp[10100-10109]:ncadg_ip_tcp[10100-10109]

		; PDATA Options.
		;

+14 −0

Original line number	Diff line number	Diff line
		{{ $data_ports := split "-" .Values.dataService.portRange }}
		{{ $data_port_start := $data_ports._0}}
		{{ $data_port_end := $data_ports._1}}
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		@@ -64,6 +67,12 @@ spec:
		value: {{ .Values.config.hsi.mountPath }}/johnny.keytab
		- name: ADL_CACHE_LOCATION
		value: /data/cache
		- name: HPSS_PORT_RANGE
		value: {{ .Values.dataService.portRange }}
		- name: HPSS_HOSTNAME
		value: {{ .Values.ingress.url }}
		- name: HPSS_PFTPC_PORT_RANGE
		value: ncacn_ip_tcp[{{ .Values.dataService.portRange }}]
		volumeMounts:
		- name: hsi-keytab-fixed
		mountPath: {{ .Values.config.hsi.mountPath }}
		@@ -74,6 +83,11 @@ spec:
		- name: http
		containerPort: 8000
		protocol: TCP
		{{- range untilStep ($data_port_start \| int ) ($data_port_end \| int ) 1 }}
		- name: hsi-data-{{ . }}
		containerPort: {{ . }}
		protocol: TCP
		{{- end }}
		livenessProbe:
		httpGet:
		path: /v1_0/healthz

+9 −0

Original line number	Diff line number	Diff line
		{{ $data_ports := split "-" .Values.dataService.portRange }}
		{{ $data_port_start := $data_ports._0}}
		{{ $data_port_end := $data_ports._1}}
		apiVersion: v1
		kind: Service
		metadata:
		@@ -11,5 +14,11 @@ spec:
		targetPort: http
		protocol: TCP
		name: http
		{{- range untilStep ($data_port_start \| int ) ($data_port_end \| int ) 1 }}
		- port: {{ . }}
		targetPort: {{ . }}
		protocol: TCP
		name: hsi-data-{{ . }}
		{{- end }}
		selector:
		{{- include "adl.selectorLabels" . \| nindent 4 }}

+3 −0