From 2b850a08a1d99a084e8cb5ea653406b40478518f Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Tue, 8 Nov 2022 14:42:41 +0100
Subject: [PATCH] Orborus version bump for minor k8s fix

---
 backend/app_sdk/build.sh            | 2 +-
 backend/app_sdk/requirements.txt    | 2 +-
 functions/onprem/orborus/build.sh   | 6 +++++-
 functions/onprem/orborus/go.mod     | 2 +-
 functions/onprem/orborus/orborus.go | 8 ++++----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/backend/app_sdk/build.sh b/backend/app_sdk/build.sh
index f3d0265b..83188d6d 100644
--- a/backend/app_sdk/build.sh
+++ b/backend/app_sdk/build.sh
@@ -2,7 +2,7 @@
 
 ### DEFAULT 
 NAME=shuffle-app_sdk
-VERSION=1.0.6
+VERSION=1.0.9
 
 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
 docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly
diff --git a/backend/app_sdk/requirements.txt b/backend/app_sdk/requirements.txt
index 8b181a2e..bacb3bc8 100644
--- a/backend/app_sdk/requirements.txt
+++ b/backend/app_sdk/requirements.txt
@@ -1,7 +1,7 @@
 urllib3==1.26.5
 requests==2.25.1
 MarkupSafe==2.0.1
-liquidpy==0.7.5
+liquidpy==0.7.6
 flask[async]==2.0.2
 waitress==2.1.0
 #flask==1.1.2
diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh
index 062b8d15..c3d288f2 100644
--- a/functions/onprem/orborus/build.sh
+++ b/functions/onprem/orborus/build.sh
@@ -1,5 +1,5 @@
 NAME=shuffle-orborus
-VERSION=1.0.7
+VERSION=1.0.9
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force
@@ -10,3 +10,7 @@ docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$
 docker push frikky/shuffle:$NAME
 docker push ghcr.io/frikky/$NAME:$VERSION
 docker push ghcr.io/frikky/$NAME:nightly
+
+docker push shuffle/shuffle:$NAME
+docker push ghcr.io/shuffle/$NAME:$VERSION
+docker push ghcr.io/shuffle/$NAME:nightly
diff --git a/functions/onprem/orborus/go.mod b/functions/onprem/orborus/go.mod
index db67d553..f2088b5f 100644
--- a/functions/onprem/orborus/go.mod
+++ b/functions/onprem/orborus/go.mod
@@ -8,5 +8,5 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/mackerelio/go-osstat v0.2.1
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.3.5
+	github.com/shuffle/shuffle-shared v0.3.15
 )
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index 4109b9ce..1ec5b4fe 100644
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -956,7 +956,7 @@ func main() {
 		}
 	}
 
-	client.Timeout = 10 * time.Second
+	client.Timeout = 30 * time.Second
 
 	fullUrl := fmt.Sprintf("%s/api/v1/workflows/queue", baseUrl)
 	req, err := http.NewRequest(
@@ -986,11 +986,11 @@ func main() {
 	hasStarted := false
 	for {
 		//go getStats()
-		//log.Printf("Prerequest")
-		//log.Printf("Postrequest")
+		log.Printf("[DEBUG] Prerequest - queue")
 		newresp, err := client.Do(req)
+		log.Printf("[DEBUG] Postrequest - queue")
 		if err != nil {
-			log.Printf("[WARNING] Failed making request: %s", err)
+			log.Printf("[WARNING] Failed making request to %s: %s", fullUrl, err)
 
 			zombiecounter += 1
 			if zombiecounter*sleepTime > workerTimeout {