Merge pull request #16 from gabemontero/http-endpoint-for-import

RHDHPAI-575: model catalog bridge POC

Author: gabemontero

Dockerfile.location

@@ -0,0 +1,19 @@
+FROM registry.redhat.io/rhel8/go-toolset:1.22.9 as builder
+
+WORKDIR /opt/app-root/src
+
+COPY go.mod go.mod
+COPY go.sum go.sum
+COPY vendor/ vendor/
+COPY cmd/ cmd/
+COPY pkg/ pkg/
+
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod=vendor -o location ./cmd/location/...
+
+FROM registry.access.redhat.com/ubi9-minimal:9.1.0
+
+COPY --from=builder /opt/app-root/src/location /usr/local/bin/location
+
+USER 65532:65532
+
+ENTRYPOINT [ "location" ]

Makefile

@@ -22,6 +22,9 @@ ARGS ?=
 .PHONY: $(BIN)
 $(BIN):
 	go build $(GO_FLAGS) -o $(BIN) $(CMD)
+	go build $(GO_FLAGS) -o _output/location ./cmd/location/...
+	go build $(GO_FLAGS) -o _output/rhoai-normalizer ./cmd/rhoai-normalizer/...
+	go build $(GO_FLAGS) -o _output/storage-rest ./cmd/storage-rest/...
 
 build: $(BIN)
 

assets/bridge/configmap.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+binaryData:
+  mnist_v1: YXBpVmVyc2lvbjogYmFja3N0YWdlLmlvL3YxYWxwaGExCmtpbmQ6IENvbXBvbmVudAptZXRhZGF0YToKICBhbm5vdGF0aW9uczoKICAgIGJhY2tzdGFnZS5pby90ZWNoZG9jcy1yZWY6IC4vCiAgbGlua3M6CiAgLSBpY29uOiBXZWJBc3NldAogICAgdGl0bGU6IEFQSSBVUkwKICAgIHR5cGU6IHdlYnNpdGUKICAgIHVybDogaHR0cHM6Ly9tbmlzdC0xMDAtMjAyNC0xMi0xM3QxOTM5Mjg0NzZ6LWdnbXRlc3QuYXBwcy5nbW9udGVybzQxNS5kZXZjbHVzdGVyLm9wZW5zaGlmdC5jb20KICAtIGljb246IFdlYkFzc2V0CiAgICB0aXRsZTogcHJlZGljdG9yIEZhc3RBUEkgVVJMCiAgICB0eXBlOiB3ZWJzaXRlCiAgICB1cmw6IGh0dHBzOi8vbW5pc3QtMTAwLTIwMjQtMTItMTN0MTkzOTI4NDc2ei1wcmVkaWN0b3ItZ2dtdGVzdC5hcHBzLmdtb250ZXJvNDE1LmRldmNsdXN0ZXIub3BlbnNoaWZ0LmNvbS9kb2NzCiAgLSBpY29uOiBXZWJBc3NldAogICAgdGl0bGU6IHByZWRpY3RvciBtb2RlbCBzZXJ2aW5nIFVSTAogICAgdHlwZTogd2Vic2l0ZQogICAgdXJsOiBodHRwczovL21uaXN0LTEwMC0yMDI0LTEyLTEzdDE5MzkyODQ3NnotcHJlZGljdG9yLWdnbXRlc3QuYXBwcy5nbW9udGVybzQxNS5kZXZjbHVzdGVyLm9wZW5zaGlmdC5jb20KICAtIGljb246IFdlYkFzc2V0CiAgICB0eXBlOiB3ZWJzaXRlCiAgICB1cmw6IGh0dHBzOi8vaHVnZ2luZ2ZhY2UuY28vdGFyaWxhYnMvbW5pc3QvcmVzb2x2ZS92MjAyMzEyMDYxNjMwMjgvbW5pc3Qub25ueAogIG5hbWU6IG1uaXN0CnNwZWM6CiAgZGVwZW5kc09uOgogIC0gcmVzb3VyY2U6MS4wLjAKICAtIGFwaToxLjAuMAogIGxpZmVjeWNsZTogcHJvZAogIG93bmVyOiB1c2VyOmt1YmU6YWRtaW4KICBwcm9maWxlOgogICAgZGlzcGxheU5hbWU6IG1uaXN0CiAgdHlwZTogbW9kZWwtc2VydmVyCi0tLQphcGlWZXJzaW9uOiBiYWNrc3RhZ2UuaW8vdjFhbHBoYTEKa2luZDogUmVzb3VyY2UKbWV0YWRhdGE6CiAgYW5ub3RhdGlvbnM6CiAgICBiYWNrc3RhZ2UuaW8vdGVjaGRvY3MtcmVmOiByZXNvdXJjZS8KICBsaW5rczoKICAtIGljb246IFdlYkFzc2V0CiAgICB0eXBlOiB3ZWJzaXRlCiAgICB1cmw6IGh0dHBzOi8vaHVnZ2luZ2ZhY2UuY28vdGFyaWxhYnMvbW5pc3QvcmVzb2x2ZS92MjAyMzEyMDYxNjMwMjgvbW5pc3Qub25ueAogIG5hbWU6IDEuMC4wCnNwZWM6CiAgZGVwZW5kZW5jeU9mOgogIC0gY29tcG9uZW50Om1uaXN0CiAgbGlmZWN5Y2xlOiBwcm9kCiAgb3duZXI6IHVzZXI6a3ViZTphZG1pbgogIHByb2ZpbGU6CiAgICBkaXNwbGF5TmFtZTogMS4wLjAKICB0eXBlOiBhaS1tb2RlbAotLS0KYXBpVmVyc2lvbjogYmFja3N0YWdlLmlvL3YxYWxwaGExCmtpbmQ6IEFQSQptZXRhZGF0YToKICBhbm5vdGF0aW9uczoKICAgIGJhY2tzdGFnZS5pby90ZWNoZG9jcy1yZWY6IGFwaS8KICBsaW5rczoKICAtIGljb246IFdlYkFzc2V0CiAgICB0aXRsZTogQVBJIFVSTAogICAgdHlwZTogd2Vic2l0ZQogICAgdXJsOiBodHRwczovL21uaXN0LTEwMC0yMDI0LTEyLTEzdDE5MzkyODQ3NnotZ2dtdGVzdC5hcHBzLmdtb250ZXJvNDE1LmRldmNsdXN0ZXIub3BlbnNoaWZ0LmNvbQogIC0gaWNvbjogV2ViQXNzZXQKICAgIHRpdGxlOiBwcmVkaWN0b3IgRmFzdEFQSSBVUkwKICAgIHR5cGU6IHdlYnNpdGUKICAgIHVybDogaHR0cHM6Ly9tbmlzdC0xMDAtMjAyNC0xMi0xM3QxOTM5Mjg0NzZ6LXByZWRpY3Rvci1nZ210ZXN0LmFwcHMuZ21vbnRlcm80MTUuZGV2Y2x1c3Rlci5vcGVuc2hpZnQuY29tL2RvY3MKICAtIGljb246IFdlYkFzc2V0CiAgICB0aXRsZTogcHJlZGljdG9yIG1vZGVsIHNlcnZpbmcgVVJMCiAgICB0eXBlOiB3ZWJzaXRlCiAgICB1cmw6IGh0dHBzOi8vbW5pc3QtMTAwLTIwMjQtMTItMTN0MTkzOTI4NDc2ei1wcmVkaWN0b3ItZ2dtdGVzdC5hcHBzLmdtb250ZXJvNDE1LmRldmNsdXN0ZXIub3BlbnNoaWZ0LmNvbQogIG5hbWU6IG1uaXN0CnNwZWM6CiAgZGVmaW5pdGlvbjogbm8tZGVmaW5pdGlvbi15ZXQKICBkZXBlbmRlbmN5T2Y6CiAgLSBjb21wb25lbnQ6bW5pc3QKICBsaWZlY3ljbGU6IHByb2QKICBvd25lcjogdXNlcjprdWJlOmFkbWluCiAgcHJvZmlsZToKICAgIGRpc3BsYXlOYW1lOiBtbmlzdAogIHR5cGU6IHVua25vd24K
+kind: ConfigMap
+metadata:
+  name: bac-import-model

assets/bridge/deployment.yaml

@@ -0,0 +1,59 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    deployment.kubernetes.io/revision: "1"
+  labels:
+    app.kubernetes.io/name: bac-import-model
+  name: bac-import-model
+spec:
+  progressDeadlineSeconds: 600
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: bac-import-model
+  strategy:
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: bac-import-model
+    spec:
+      containers:
+      - image: quay.io/gabemontero/import-location:latest
+        imagePullPolicy: Always
+        name: location
+        ports:
+        - containerPort: 8080
+          name: location
+          protocol: TCP
+        resources:
+          limits:
+            cpu: "0"
+            memory: "0"
+          requests:
+            cpu: "0"
+            memory: "0"
+        securityContext:
+          readOnlyRootFilesystem: true
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /data
+          name: location
+          readOnly: true
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext:
+        runAsNonRoot: true
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - configMap:
+          defaultMode: 420
+          name: bac-import-model
+        name: location

assets/bridge/route.yaml

@@ -0,0 +1,10 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: bac-import-model
+spec:
+  to:
+    kind: Service
+    name: bac-import-model
+    weight: 100
+  wildcardPolicy: None

assets/bridge/service.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: bac-import-model
+  name: bac-import-model
+spec:
+  ports:
+  - name: location
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: bac-import-model

cmd/location/main.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	goflag "flag"
+	gin_gonic_http_srv "github.com/redhat-ai-dev/rhdh-ai-catalog-cli/pkg/cmd/server/location/server"
+	"github.com/redhat-ai-dev/rhdh-ai-catalog-cli/pkg/util"
+	"io/fs"
+	"k8s.io/klog/v2"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func main() {
+	flagset := goflag.NewFlagSet("location", goflag.ContinueOnError)
+	klog.InitFlags(flagset)
+
+	content := map[string]*gin_gonic_http_srv.ImportLocation{}
+	err := filepath.Walk("/data", func(path string, info fs.FileInfo, err error) error {
+		if info == nil {
+			return nil
+		}
+		if strings.Contains(info.Name(), "_") {
+			c := []byte{}
+			klog.Infoln("processing configmap file " + info.Name())
+			if info.IsDir() {
+				return nil
+			}
+			if strings.HasPrefix(info.Name(), "..") {
+				klog.Infof("skipping file starting with ..: %s", info.Name())
+			}
+			fullName := "/data/" + info.Name()
+			klog.Infof("reading file %s", fullName)
+			c, err = os.ReadFile(fullName)
+			if err != nil {
+				klog.Errorf("%s", err.Error())
+				klog.Flush()
+				return err
+			}
+			klog.Infof("adding file %s with content len %d to list", info.Name(), len(c))
+			ic := &gin_gonic_http_srv.ImportLocation{}
+			content[info.Name()] = ic
+		}
+		return nil
+	})
+	if err != nil {
+		klog.Errorf("%s", err.Error())
+		os.Exit(-1)
+	}
+	server := gin_gonic_http_srv.NewImportLocationServer(content)
+	stopCh := util.SetupSignalHandler()
+	server.Run(stopCh)
+
+}

cmd/rhoai-normalizer/main.go

@@ -0,0 +1,71 @@
+package main
+
+import (
+	"flag"
+	rhoai_normalizer "github.com/redhat-ai-dev/rhdh-ai-catalog-cli/pkg/cmd/server/rhoai-normalizer"
+
+	"k8s.io/klog/v2"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	_ "net/http/pprof"
+	"os"
+
+	"github.com/go-logr/logr"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/healthz"
+)
+
+var (
+	mainLog logr.Logger
+)
+
+func main() {
+	var pprofAddr string
+	flag.StringVar(&pprofAddr, "pprof-address", "6000", "The address the pprof endpoint binds to.")
+
+	opts := zap.Options{}
+	opts.BindFlags(flag.CommandLine)
+	klog.InitFlags(flag.CommandLine)
+	flag.Parse()
+
+	/*
+			FYI tracing set set with this zap argument on the deployment (see https://sdk.operatorframework.io/docs/building-operators/golang/references/logging/)
+		          args:
+		            - -zap-log-level=6
+	*/
+
+	logger := zap.New(zap.UseFlagOptions(&opts))
+	ctrl.SetLogger(logger)
+	mainLog = ctrl.Log.WithName("main")
+
+	ctx := ctrl.SetupSignalHandler()
+	restConfig := ctrl.GetConfigOrDie()
+	restConfig.QPS = 50
+	restConfig.Burst = 50
+	var mgr ctrl.Manager
+	var err error
+	mopts := ctrl.Options{}
+
+	mgr, err = rhoai_normalizer.NewControllerManager(ctx, restConfig, mopts, pprofAddr)
+	if err != nil {
+		mainLog.Error(err, "unable to start controller-runtime manager")
+		os.Exit(1)
+	}
+
+	if err = mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
+		mainLog.Error(err, "unable to set up health check")
+		os.Exit(1)
+	}
+	if err = mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
+		mainLog.Error(err, "unable to set up ready check")
+		os.Exit(1)
+	}
+
+	mainLog.Info("Starting controller-runtime manager")
+
+	if err = mgr.Start(ctx); err != nil {
+		mainLog.Error(err, "problem running controller-runtime manager")
+		os.Exit(1)
+	}
+
+}

cmd/storage-rest/main.go

@@ -0,0 +1,38 @@
+package main
+
+import (
+	goflag "flag"
+	"fmt"
+	"github.com/redhat-ai-dev/rhdh-ai-catalog-cli/pkg/cmd/server/storage"
+	"github.com/redhat-ai-dev/rhdh-ai-catalog-cli/pkg/config"
+	"github.com/redhat-ai-dev/rhdh-ai-catalog-cli/pkg/types"
+	"github.com/redhat-ai-dev/rhdh-ai-catalog-cli/pkg/util"
+	"k8s.io/klog/v2"
+	"os"
+)
+
+func main() {
+	flagset := goflag.NewFlagSet("storage-rest", goflag.ContinueOnError)
+	klog.InitFlags(flagset)
+
+	st := os.Getenv("STORAGE_TYPE")
+	storageType := types.BridgeStorageType(st)
+
+	bs := storage.NewBridgeStorage(storageType)
+
+	bridgeURL := os.Getenv("BRIDGE_URL")
+	cfg := &config.Config{}
+	restCfg, err := util.GetK8sConfig(cfg)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%s", err.Error())
+		os.Exit(1)
+	}
+	bridgeToken := util.GetCurrentToken(restCfg)
+	bkstgURL := os.Getenv("BKSTG_URL")
+	bkstgToken := os.Getenv("RHDH_TOKEN")
+
+	server := storage.NewStorageRESTServer(bs, bridgeURL, bridgeToken, bkstgURL, bkstgToken)
+	stopCh := util.SetupSignalHandler()
+	server.Run(stopCh)
+
+}

compare.yaml

@@ -0,0 +1,68 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: simple-http-app
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: simple-http-app
+  template:
+    metadata:
+      labels:
+        app: simple-http-app
+    spec:
+      containers:
+        - name: simple-http
+          image: nginx:latest
+          ports:
+            - containerPort: 80
+          volumeMounts:
+            - mountPath: /usr/share/nginx/html
+              name: web-content
+      securityContext:
+        runAsUser: 0
+      volumes:
+        - name: web-content
+          configMap:
+            name: simple-http-content
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: simple-http-content
+data:
+  index.html: |
+    <!DOCTYPE html>
+    <html>
+    <head>
+        <title>Hello World!</title>
+    </head>
+    <body>
+        <h1>Hello World!</h1>
+    </body>
+    </html>
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: simple-http-service
+spec:
+  selector:
+    app: simple-http-app
+  ports:
+    - port: 80
+      targetPort: 80
+
+---
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: simple-http-route
+spec:
+  to:
+    kind: Service
+    name: simple-http-service
+