From: Taewan Kim <t25.kim@samsung.com>
Date: Fri, 1 Sep 2023 06:37:40 +0000 (+0900)
Subject: Use in-cluster configuration if the KUBECONFIG env variable is empty.
X-Git-Tag: 1.0.0~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=f4f779cab5f0cf20120f32e9de7aaccb93b17cd7;p=aiml-fw%2Faihp%2Fips%2Fkserve-adapter.git

Use in-cluster configuration if the KUBECONFIG env variable is empty.

Issue-ID: AIMLFW-61

Change-Id: I3f3a1402dada384df0a9755460dd3aedad6ee0f6
Signed-off-by: Taewan Kim <t25.kim@samsung.com>
---

diff --git a/Dockerfile b/Dockerfile
index 3366a8d..a3996f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,16 +32,20 @@ FROM golang:1.19.8-bullseye
 
 WORKDIR /root/
 
+RUN curl https://baltocdn.com/helm/signing.asc | apt-key add -
+RUN apt-get install apt-transport-https --yes
+RUN echo "deb https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list
+
+RUN apt-get update
+RUN apt-get install helm
+
 COPY --from=builder /kserve-adapter/kserve-adapter .
+COPY --from=builder /kserve-adapter/pkg/helm/data pkg/helm/data
 
-EXPOSE 48099
+ENV API_SERVER_PORT=10000
+ENV CHART_WORKSPACE_PATH="/root/pkg/helm/data"
+EXPOSE 10000
 
-ENV KUBECONFIG=/home/.kube/config \
-    API_SERVER_PORT=48099 \
-    CHART_WORKSPACE_PATH="/kserve-adapter/pkg/helm/data" \
-    RIC_DMS_IP=127.0.0.1 \
-    RIC_DMS_PORT=8000
-    
 ENTRYPOINT ["./kserve-adapter"]
 
 
diff --git a/pkg/client/kserve/client.go b/pkg/client/kserve/client.go
index c282bac..74319ff 100644
--- a/pkg/client/kserve/client.go
+++ b/pkg/client/kserve/client.go
@@ -24,6 +24,7 @@ import (
 	"github.com/kserve/kserve/pkg/client/clientset/versioned"
 	client_v1beta1 "github.com/kserve/kserve/pkg/client/clientset/versioned/typed/serving/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
 	"gerrit.o-ran-sc.org/r/aiml-fw/aihp/ips/kserve-adapter/pkg/commons/errors"
@@ -64,7 +65,14 @@ func init() {
 }
 
 func inferenceServiceGetter(path string) (api client_v1beta1.InferenceServiceInterface, err error) {
-	config, err := clientcmd.BuildConfigFromFlags("", path)
+	var config *rest.Config
+	if len(path) > 0 {
+		logger.Logging(logger.DEBUG, "outofcluster")
+		config, err = clientcmd.BuildConfigFromFlags("", path)
+	} else {
+		logger.Logging(logger.DEBUG, "incluster")
+		config, err = rest.InClusterConfig()
+	}
 	if err != nil {
 		logger.Logging(logger.ERROR, err.Error())
 		return