Merge branch 'main' into cos-result

Qiskit · Jan 28, 2025 · 521dd80 · 521dd80
2 parents 4c54dd6 + cd9b393
commit 521dd80
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 521 deletions.
diff --git a/.github/workflows/icr-image-build-and-push.yaml b/.github/workflows/icr-image-build-and-push.yaml
@@ -24,9 +24,6 @@ jobs:
           - imagename: qiskit-serverless/gateway
             dockerfile: ./gateway/Dockerfile
             platforms: linux/amd64,linux/arm64
-          - imagename: qiskit-serverless/proxy
-            dockerfile: ./proxy/Dockerfile
-            platforms: linux/amd64,linux/arm64
     steps:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #4.1.7

diff --git a/.github/workflows/kubernetes-deploy.yaml b/.github/workflows/kubernetes-deploy.yaml
@@ -49,12 +49,10 @@ jobs:
             --set gateway.image.repository=gateway \
             --set gateway.image.tag=test \
             --set gateway.application.ray.nodeImage=ray:test \
-            --set gateway.application.ray.proxyImage=proxy:test \
             --set gateway.application.ray.cpu=1 \
             --set gateway.application.debug=1 \
             --set gateway.application.limits.keepClusterOnComplete=false \
             --set gateway.application.authMockproviderRegistry=test \
-            --set gateway.application.proxy.enabled=false \
             .
           GATEWAY=$(kubectl get pod -l app.kubernetes.io/name=gateway -o name)
           kubectl wait --for=condition=Ready "$GATEWAY" --timeout 5m

diff --git a/.github/workflows/proxy-verify.yaml b/.github/workflows/proxy-verify.yaml
diff --git a/.github/workflows/update-component-versions.yaml b/.github/workflows/update-component-versions.yaml
@@ -39,7 +39,6 @@ jobs:
           sed -i "s/version: ${OLDNUM}/version: ${NEWNUM}/" charts/qiskit-serverless/charts/gateway/Chart.yaml
           sed -i "s/appVersion: \"${OLDNUM}\"/appVersion: \"${NEWNUM}\"/" charts/qiskit-serverless/charts/gateway/Chart.yaml
           sed -i "s/ray-node:${OLDNUM}/ray-node:${NEWNUM}/" charts/qiskit-serverless/charts/gateway/values.yaml
-          sed -i "s/qiskit-serverless\/proxy:${OLDNUM}/qiskit-serverless\/proxy:${NEWNUM}/" charts/qiskit-serverless/charts/gateway/values.yaml
           sed -i "s/tag: \"${OLDNUM}\"/tag: \"${NEWNUM}\"/" charts/qiskit-serverless/values.yaml
           sed -i "s/ray-node:${OLDNUM}/ray-node:${NEWNUM}/" charts/qiskit-serverless/values.yaml
           sed -i "s/version: ${OLDNUM}/version: ${NEWNUM}/" charts/qiskit-serverless/values.yaml

diff --git a/Dockerfile-ray-node b/Dockerfile-ray-node
@@ -2,9 +2,8 @@ FROM registry.access.redhat.com/ubi9-minimal:9.4@sha256:104cf11d890aeb7dd5728b7d
 RUN microdnf install -y \
     python3.11-3.11.9 \
     python3.11-devel-3.11.9 \
-    vim-enhanced-8.2.2637 \
-    wget-1.21.1 &&\
-    microdnf clean all
+    wget-1.21.1
+RUN microdnf clean all
 RUN ln -s /usr/bin/python3.11 /usr/local/bin/python3 && \
     ln -s /usr/bin/python3.11 /usr/local/bin/python &&\
     ln -s /usr/bin/pip3.11 /usr/local/bin/pip3 &&\

diff --git a/Makefile b/Makefile
@@ -6,31 +6,24 @@ version=latest
 repository=icr.io/quantum-public
 rayNodeImageName=$(repository)/qiskit-serverless/ray-node
 gatewayImageName=$(repository)/qiskit-serverless/gateway
-proxyImageName=$(repository)/qiskit-serverless/proxy
 
 # =============
 # Docker images
 # =============
 
 build-and-push: build-all push-all
 
-build-all: build-ray-node build-gateway build-proxy
-push-all: push-ray-node push-gateway push-proxy
+build-all: build-ray-node build-gateway
+push-all: push-ray-node push-gateway
 
 build-ray-node:
 	docker build -t $(rayNodeImageName):$(version) -f Dockerfile-ray-node .
 
 build-gateway:
 	docker build -t $(gatewayImageName):$(version) -f ./gateway/Dockerfile .
 
-build-proxy:
-	docker build -t $(proxyImageName):$(version) -f ./proxy/Dockerfile .
-
 push-ray-node:
 	docker push $(rayNodeImageName):$(version)
 
 push-gateway:
 	docker push $(gatewayImageName):$(version)
-
-push-proxy:
-	docker push $(proxyImageName):$(version)
diff --git a/charts/qiskit-serverless/charts/gateway/templates/proxyinit.sh b/charts/qiskit-serverless/charts/gateway/templates/proxyinit.sh
diff --git a/charts/qiskit-serverless/charts/gateway/templates/rayclustertemplate.yaml b/charts/qiskit-serverless/charts/gateway/templates/rayclustertemplate.yaml
@@ -68,18 +68,6 @@ data:
                     valueFrom:
                       fieldRef:
                         fieldPath: status.podIP
-{{- end }}
-{{- if .Values.application.proxy.enabled }}
-              - name: iptables
-                image: {{ .Values.application.proxy.initImage }}
-                command: ["sh", "-c", "/var/iptables/iptables.sh"]
-                volumeMounts:
-                  - mountPath: /var/iptables
-                    name: iptables
-                securityContext:
-                  privileged: true
-                  capabilities:
-                    add: ["NET_ADMIN"]
 {{- end }}
             affinity:
             containers:
@@ -159,72 +147,6 @@ data:
                   value: {{ .Values.application.ray.openTelemetryCollector.insecure | quote }}
                 - name: OT_ENABLED
                   value: {{ .Values.application.ray.openTelemetryCollector.enabled | quote }}
-{{- end }}
-{{- if .Values.application.proxy.enabled }}
-            - image: {{ .Values.application.ray.proxyImage }}
-              securityContext:
-                runAsGroup: 1000
-              imagePullPolicy: IfNotPresent
-              name: proxy
-              resources:
-                limits:
-                  cpu: {{ .Values.application.proxy.cpu }}
-                  memory: {{ .Values.application.proxy.memory }}Gi
-              volumeMounts:
-              - mountPath: /tmp/ray
-                name: log-volume
-              - mountPath: /etc/ca/tls
-                name: ca-tls
-                readOnly: true
-              - mountPath: /etc/ray/tls
-                name: ray-tls
-{{- if .Values.useCertManager }}
-              - mountPath: /tmp/tls
-                name: cert-tls
-{{- end }}
-              - mountPath: /data
-                name: user-storage
-                subPath: {{`{{ user_data_folder }}`}}
-              env:
-                # Environment variables for Ray TLS authentication.
-                # See https://docs.ray.io/en/latest/ray-core/configure.html#tls-authentication for more details.
-                - name: DST_PROTOCOL
-                  value: "https"
-                - name: GATEWAY_URL
-                  value: "gateway:8000"
-{{- if .Values.application.ray.useTLS }}
-                - name: RAY_USE_TLS
-                  value: "1"
-{{- end }}
-{{- if .Values.useCertManager }}
-                - name: RAY_TLS_SERVER_CERT
-                  value: "/tmp/tls/tls.crt"
-                - name: RAY_TLS_SERVER_KEY
-                  value: "/tmp/tls/tls.key"
-                - name: RAY_TLS_CA_CERT
-                  value: "/tmp/tls/ca.crt"
-{{- else }}
-                - name: RAY_TLS_SERVER_CERT
-                  value: "/etc/ray/tls/tls.crt"
-                - name: RAY_TLS_SERVER_KEY
-                  value: "/etc/ray/tls/tls.key"
-                - name: RAY_TLS_CA_CERT
-                  value: "/etc/ca/tls/ca.crt"
-{{- end }}
-{{- if .Values.application.ray.openTelemetry }}
-                - name: OT_RAY_TRACER
-                  value: "1"
-{{- end }}
-{{- if .Values.application.ray.openTelemetryCollector.local }}
-                - name: OT_JAEGER_HOST_KEY
-                  value: {{ .Values.application.ray.openTelemetryCollector.host }}
-                - name: OT_JAEGER_PORT_KEY
-                  value: {{ .Values.application.ray.openTelemetryCollector.port | quote }}
-                - name: OT_INSECURE
-                  value: {{ .Values.application.ray.openTelemetryCollector.insecure | quote }}
-                - name: OT_ENABLED
-                  value: {{ .Values.application.ray.openTelemetryCollector.enabled | quote }}
-{{- end }}
 {{- end }}
             imagePullSecrets: []
 {{- if .Values.useCertManager }}
@@ -266,12 +188,3 @@ data:
             - name: user-storage
               persistentVolumeClaim:
                 claimName: {{ .Values.cos.claimName }}
-{{- if .Values.application.proxy.enabled }}
-            - name: iptables
-              configMap:
-                name: proxy-iptables
-                defaultMode: 0777
-                items:
-                - key: iptables.sh
-                  path: iptables.sh
-{{- end }}
diff --git a/charts/qiskit-serverless/charts/gateway/values.yaml b/charts/qiskit-serverless/charts/gateway/values.yaml
@@ -27,7 +27,6 @@ application:
     maxReplicas: 4
     opensslImage: registry.access.redhat.com/ubi8/openssl:8.8-9
     kubectlImage: alpine/k8s:1.29.2@sha256:a51aa37f0a34ff827c7f2f9cb7f6fbb8f0e290fa625341be14c2fcc4b1880f60
-    proxyImage: "icr.io/quantum-public/qiskit-serverless/proxy:0.18.1"
     scrapeWithPrometheus: true
     openTelemetry: false
     openTelemetryCollector:
@@ -38,11 +37,6 @@ application:
       insecure: 0
     useTLS: true
     gpuJobsConfig: "api/v1/gpu-jobs.json"
-  proxy:
-    enabled: true
-    cpu: 1
-    memory: 1
-    initImage: alpine:latest
   limits:
     maxJobsPerUser: 2
     maxComputeResources: 4

diff --git a/docs/deployment/custom_function/local_cluster/deploy.sh b/docs/deployment/custom_function/local_cluster/deploy.sh
@@ -44,12 +44,10 @@ helm install qs \
 --set gateway.image.repository=gateway \
 --set gateway.image.tag=test \
 --set gateway.application.ray.nodeImage=ray:test \
---set gateway.application.ray.proxyImage=proxy:test \
 --set gateway.application.ray.cpu=1 \
 --set gateway.application.debug=1 \
 --set gateway.application.limits.keepClusterOnComplete=false \
 --set gateway.application.authMockproviderRegistry=test \
---set gateway.application.proxy.enabled=false \
 --set ingress.hosts[0].host=localhost \
 --set ingress.hosts[0].paths[0].path=/ \
 --set ingress.hosts[0].paths[0].pathType=Prefix \

diff --git a/proxy/Dockerfile b/proxy/Dockerfile
diff --git a/proxy/proxy/entrypoint.sh b/proxy/proxy/entrypoint.sh