Merge branch 'main' into qiskit-main

Author: Tansito

charts/qiskit-serverless/Chart.lock

@@ -1,7 +1,7 @@
 dependencies:
 - name: gateway
   repository: ""
-  version: 0.19.0
+  version: 0.20.0
 - name: nginx-ingress-controller
   repository: https://charts.bitnami.com/bitnami
   version: 9.11.0
@@ -11,5 +11,5 @@ dependencies:
 - name: kuberay-operator
   repository: https://ray-project.github.io/kuberay-helm
   version: 1.1.1
-digest: sha256:93a046a5058892f841d498bef5bede802fe06dddf07d76755cd66c2eabaec3a9
-generated: "2025-02-04T15:45:49.756017738Z"
+digest: sha256:ff4329caaee3f5dbea33e305a4c94c3ef0dc1f16ddafc477c5d4744a4e539ef9
+generated: "2025-02-25T15:58:02.359109934Z"

charts/qiskit-serverless/Chart.yaml

@@ -4,13 +4,13 @@ description: Qiskit-Serverless helm chart that contains different dependencies.
 
 type: application
 
-version: 0.19.0
-appVersion: "0.19.0"
+version: 0.20.0
+appVersion: "0.20.0"
 
 dependencies:
   - name: gateway
     condition: gatewayEnable
-    version: 0.19.0
+    version: 0.20.0
   - name: nginx-ingress-controller
     condition: nginxIngressControllerEnable
     version: 9.11.0

charts/qiskit-serverless/charts/gateway/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.19.0
+version: 0.20.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.19.0"
+appVersion: "0.20.0"

charts/qiskit-serverless/charts/gateway/templates/deployment.yaml

@@ -109,6 +109,12 @@ spec:
               value: {{ .Values.application.auth.token.url | quote }}
             - name: SETTINGS_TOKEN_AUTH_VERIFICATION_FIELD
               value: {{ .Values.application.auth.token.verificationField | quote }}
+            - name: IAM_IBM_CLOUD_BASE_URL
+              value: {{ .Values.application.auth.token.iamUrl | quote }}
+            - name: RESOURCE_CONTROLLER_IBM_CLOUD_BASE_URL
+              value: {{ .Values.application.auth.token.resourceControllerUrl | quote }}
+            - name: RESOURCE_PLANS_ID_ALLOWED
+              value: {{ .Values.application.auth.token.resourcePlansAllowed | quote }}
             - name: SETTINGS_AUTH_MOCKPROVIDER_REGISTRY
               value: {{ .Values.application.authMockproviderRegistry }}
             - name: RAY_CLUSTER_WORKER_REPLICAS
@@ -156,8 +162,6 @@ spec:
               value: {{ .Values.application.ray.openTelemetryCollector.host }}:{{ .Values.application.ray.openTelemetryCollector.port }}
             - name: OTEL_EXPORTER_OTLP_TRACES_INSECURE
               value: {{ .Values.application.ray.openTelemetryCollector.insecure | quote }}
-            - name: QISKIT_IBM_CHANNEL
-              value: {{ .Values.application.qiskitRuntime.channel }}
             - name: QISKIT_IBM_URL
               value: {{ .Values.application.qiskitRuntime.url }}
             - name: IQP_QCON_API_BASE_URL

charts/qiskit-serverless/charts/gateway/values.yaml

@@ -18,7 +18,7 @@ application:
   superuser:
     enable: true
   ray:
-    nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.19.0"
+    nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.20.0"
     cpu: 2
     memory: 2
     gpu: 1
@@ -44,7 +44,6 @@ application:
     keepClusterOnComplete: False
     programTimeoutDays: 14
   qiskitRuntime:
-    channel: "ibm_quantum"
     url: "https://auth.quantum-computing.ibm.com/api"
   iqpQcon:
     url: "https://api-qcon.quantum.ibm.com/api"

charts/qiskit-serverless/values.yaml

@@ -2,7 +2,7 @@
 # Qiskit Serverless Info
 # ===================
 global:
-  version: 0.19.0
+  version: 0.20.0
 
 # ===================
 # Qiskit Serverless configs
@@ -47,7 +47,7 @@ gateway:
   image:
     repository: "icr.io/quantum-public/qiskit-serverless/gateway"
     pullPolicy: IfNotPresent
-    tag: "0.19.0"
+    tag: "0.20.0"
   application:
     siteHost: "http://gateway:8000"
     rayHost: "http://kuberay-head-svc:8265"
@@ -59,7 +59,7 @@ gateway:
       type: ClusterIP
       port: 8000
     ray:
-      nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.19.0"
+      nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.20.0"
       opensslImage: registry.access.redhat.com/ubi8/openssl:8.9-13
       kubectlImage: alpine/k8s:1.29.13
       gpuJobsConfig: "/tmp/gpujobs/gpu-jobs.json"

client/qiskit_serverless/VERSION.txt

@@ -1 +1 @@
-0.19.0
+0.20.0

client/qiskit_serverless/core/client.py

@@ -57,7 +57,11 @@ class BaseClient(JobService, RunService, JsonSerializable, ABC):
     """
 
     def __init__(  # pylint:  disable=too-many-positional-arguments
-        self, name: str, host: Optional[str] = None, token: Optional[str] = None
+        self,
+        name: str,
+        host: Optional[str] = None,
+        token: Optional[str] = None,
+        instance: Optional[str] = None,
     ):
         """
         Initialize a BaseClient instance.
@@ -66,10 +70,12 @@ def __init__(  # pylint:  disable=too-many-positional-arguments
             name: name of client
             host: host of client a.k.a managers host
             token: authentication token for manager
+            instance: IBM Cloud CRN
         """
         self.name = name
         self.host = host
         self.token = token
+        self.instance = instance
 
     @classmethod
     @abstractmethod