From 5f0ae33eab4c186db224bbc1e8f10f38781d65e8 Mon Sep 17 00:00:00 2001 From: jiangpengcheng Date: Sat, 21 Oct 2023 11:56:53 +0800 Subject: [PATCH] Fix rust oauth2 --- api/compute/v1alpha1/common.go | 2 +- controllers/spec/common.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api/compute/v1alpha1/common.go b/api/compute/v1alpha1/common.go index 93bfa04f..3a8d9076 100644 --- a/api/compute/v1alpha1/common.go +++ b/api/compute/v1alpha1/common.go @@ -131,7 +131,7 @@ func (o *OAuth2Config) GetMountFile() string { } func (o *OAuth2Config) AuthenticationParameters() string { - return fmt.Sprintf(`'{"privateKey":"%s","private_key":"%s","issuerUrl":"%s","issuer_url":"%s","audience":"%s","scope":"%s"}'`, o.GetMountFile(), o.GetMountFile(), o.IssuerURL, o.IssuerURL, o.Audience, o.Scope) + return fmt.Sprintf(`'{"credentials_url":"file://%s","privateKey":"%s","private_key":"%s","issuerUrl":"%s","issuer_url":"%s","audience":"%s","scope":"%s"}'`, o.GetMountFile(), o.GetMountFile(), o.GetMountFile(), o.IssuerURL, o.IssuerURL, o.Audience, o.Scope) } type GenericAuth struct { diff --git a/controllers/spec/common.go b/controllers/spec/common.go index f4ecf8f7..08b29bd7 100644 --- a/controllers/spec/common.go +++ b/controllers/spec/common.go @@ -58,14 +58,15 @@ const ( EnvShardID = "SHARD_ID" FunctionsInstanceClasspath = "pulsar.functions.instance.classpath" DefaultRunnerTag = "2.10.0.0-rc10" + DefaultGenericRunnerTag = "0.1.0" DefaultRunnerPrefix = "streamnative/" DefaultRunnerImage = DefaultRunnerPrefix + "pulsar-all:" + DefaultRunnerTag DefaultJavaRunnerImage = DefaultRunnerPrefix + "pulsar-functions-java-runner:" + DefaultRunnerTag DefaultPythonRunnerImage = DefaultRunnerPrefix + "pulsar-functions-python-runner:" + DefaultRunnerTag DefaultGoRunnerImage = DefaultRunnerPrefix + "pulsar-functions-go-runner:" + DefaultRunnerTag - DefaultGenericNodejsRunnerImage = DefaultRunnerPrefix + "pulsar-functions-generic-nodejs-runner:" + DefaultRunnerTag - DefaultGenericPythonRunnerImage = DefaultRunnerPrefix + "pulsar-functions-generic-python-runner:" + DefaultRunnerTag - DefaultGenericRunnerImage = DefaultRunnerPrefix + "pulsar-functions-generic-base-runner:" + DefaultRunnerTag + DefaultGenericNodejsRunnerImage = DefaultRunnerPrefix + "pulsar-functions-generic-nodejs-runner:" + DefaultGenericRunnerTag + DefaultGenericPythonRunnerImage = DefaultRunnerPrefix + "pulsar-functions-generic-python-runner:" + DefaultGenericRunnerTag + DefaultGenericRunnerImage = DefaultRunnerPrefix + "pulsar-functions-generic-base-runner:" + DefaultGenericRunnerTag PulsarAdminExecutableFile = "/pulsar/bin/pulsar-admin" WorkDir = "/pulsar/"