From f7085e1a72f8411953e65c3fcce852a8d627376a Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Mon, 27 May 2024 14:35:53 +0200
Subject: [PATCH] Use layer1-port-doris

---
 rds/base/doris-deployment.yml    | 39 +++++++++++--------------
 rds/base/doris-gu-deployment.yml | 49 --------------------------------
 rds/base/doris-gu-service.yaml   | 25 ----------------
 3 files changed, 17 insertions(+), 96 deletions(-)
 delete mode 100644 rds/base/doris-gu-deployment.yml
 delete mode 100644 rds/base/doris-gu-service.yaml

diff --git a/rds/base/doris-deployment.yml b/rds/base/doris-deployment.yml
index 3459c73..a228821 100644
--- a/rds/base/doris-deployment.yml
+++ b/rds/base/doris-deployment.yml
@@ -19,35 +19,30 @@ spec:
     spec:
       containers:
       - name: doris
-        image: docker.sunet.se/rds/doris-rds:ci-RDS-Connectors-13
+        image: docker.sunet.se/rds/doris-rds:git-15de3c5b9
         env:
-          - name: ASPNETCORE_ENVIRONMENT
-            value: Development
-          - name: ASPNETCORE_URLS
-            value: http://+:80
-          - name: Domain
-            value: sunet.se
           - name: ScieboRds__TokenStorageUrl
-            value: http://layer3-token-storage 
-          - name: S3__Url
-            value: dummy
-          - name: ManifestIndex__Url
-            value: https://snd-storage-metadata-index-test-snd-dev.apps.k8s.gu.se
-          - name: ManifestIndex__ApiKey
+            value: http://layer3-token-storage
+          - name: Doris__ApiKey
             valueFrom:
               secretKeyRef:
-                name: doris-api-key
+                name: doris-gu-secrets
                 key: "api-key"
-          - name: S3__AccessKey
+          - name: Doris__DorisApiEnabled
+            value: true
+          - name: Doris__PrincipalDomain
+            value: gu.se
+          - name: Doris__ApiUrl
+            value: https://dev.snd.se/doris/api/rocrate
+          - name: NextCloud__BaseUrl
+            value: https://gu.drive.test.sunet.se
+          - name: NextCloud__User
+            value: _doris_datasets
+          - name: NextCloud__Password
             valueFrom:
               secretKeyRef:
-                name: doris-s3-key
-                key: "s3-key"
-          - name: S3__SecretKey
-            valueFrom:
-              secretKeyRef:
-                name: doris-s3-secret
-                key: "s3-secret"
+                name: doris-gu-secret
+                key: "nextcloudpw"
         resources: {}
   strategy: {}
 status: {}
diff --git a/rds/base/doris-gu-deployment.yml b/rds/base/doris-gu-deployment.yml
deleted file mode 100644
index b794d76..0000000
--- a/rds/base/doris-gu-deployment.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: layer1-port-doris
-  namespace: helmrds
-  labels:
-    app: layer1-port-doris
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: layer1-port-doris
-  template:
-    metadata:
-      creationTimestamp:
-      labels:
-        app: layer1-port-doris
-    spec:
-      containers:
-      - name: doris
-        image: docker.sunet.se/rds/doris-rds:git-15de3c5b9
-        env:
-          - name: ScieboRds__TokenStorageUrl
-            value: http://layer3-token-storage
-          - name: Doris__ApiKey
-            valueFrom:
-              secretKeyRef:
-                name: doris-gu-secrets
-                key: "api-key"
-          - name: Doris__DorisApiEnabled
-            value: true
-          - name: Doris__PrincipalDomain
-            value: gu.se
-          - name: Doris__ApiUrl
-            value: https://dev.snd.se/doris/api/rocrate
-          - name: NextCloud__BaseUrl
-            value: https://gu.drive.test.sunet.se
-          - name: NextCloud__User
-            value: _doris_datasets
-          - name: NextCloud__Password
-            valueFrom:
-              secretKeyRef:
-                name: doris-gu-secret
-                key: "nextcloudpw"
-
-        resources: {}
-  strategy: {}
-status: {}
diff --git a/rds/base/doris-gu-service.yaml b/rds/base/doris-gu-service.yaml
deleted file mode 100644
index 268236a..0000000
--- a/rds/base/doris-gu-service.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-apiVersion: v1
-items:
-- apiVersion: v1
-  kind: Service
-  metadata:
-    labels:
-      app: layer1-gu-port-doris
-    name: layer1-gu-port-doris
-    namespace: helmrds
-  spec:
-    ports:
-    - port: 80
-      protocol: TCP
-      targetPort: 8080
-    selector:
-      app: layer1-gu-port-doris
-    sessionAffinity: None
-    type: ClusterIP
-  status:
-    loadBalancer: {}
-kind: List
-metadata:
-  resourceVersion: ""
-  selfLink: ""