Merge pull request #228 from grycap/devel

Changes in module version
grycap · Feb 9, 2024 · 574e526 · 574e526
2 parents 517db29 + d26ddad
commit 574e526
Show file tree

Hide file tree

Showing 41 changed files with 68 additions and 68 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,8 +13,8 @@ COPY main.go .
 COPY pkg pkg
 
 RUN GOOS=${GOOS} CGO_ENABLED=0 go build --ldflags "-s -w \
--X \"github.com/grycap/oscar/v2/pkg/version.Version=${VERSION}\" \
--X \"github.com/grycap/oscar/v2/pkg/version.GitCommit=${GIT_COMMIT}\"" \
+-X \"github.com/grycap/oscar/v3/pkg/version.Version=${VERSION}\" \
+-X \"github.com/grycap/oscar/v3/pkg/version.GitCommit=${GIT_COMMIT}\"" \
 -a -installsuffix cgo -o oscar .
 
 

diff --git a/docs/invoking.md b/docs/invoking.md
@@ -218,7 +218,7 @@ curl {-k} -X POST https://{oscar_endpoint}/system/services/body-pose-detection-a
 Finally, the complete command that works in [Local Testing](https://docs.oscar.grycap.net/local-testing/) with an image called `people.jpeg` as input and `output_posenet.zip` as output.
 
 ``` bash
-curl -X POST https://localhost/system/services/body-pose-detection-async/exposed/v2/models/posenetclas/predict/ -H  "accept: */*" -H  "Content-Type: multipart/form-data" -F "[email protected];type=image/png" --output output_posenet.zip
+curl -X POST https://localhost/system/services/body-pose-detection-async/exposed/v3/models/posenetclas/predict/ -H  "accept: */*" -H  "Content-Type: multipart/form-data" -F "[email protected];type=image/png" --output output_posenet.zip
 ```
 
 Another FDL example shows how to expose a simple NGINX server as an OSCAR service:

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/grycap/oscar/v2
+module github.com/grycap/oscar/v3
 
 go 1.18
 

diff --git a/main.go b/main.go
@@ -22,11 +22,11 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/backends"
-	"github.com/grycap/oscar/v2/pkg/handlers"
-	"github.com/grycap/oscar/v2/pkg/resourcemanager"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils/auth"
+	"github.com/grycap/oscar/v3/pkg/backends"
+	"github.com/grycap/oscar/v3/pkg/handlers"
+	"github.com/grycap/oscar/v3/pkg/resourcemanager"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils/auth"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 )

diff --git a/pkg/backends/fake.go b/pkg/backends/fake.go
@@ -22,7 +22,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	"k8s.io/client-go/kubernetes"
 	testclient "k8s.io/client-go/kubernetes/fake"
 )

diff --git a/pkg/backends/fake_test.go b/pkg/backends/fake_test.go
@@ -19,7 +19,7 @@ package backends
 import (
 	"testing"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 )
 
 func TestMakeFakeBackend(t *testing.T) {

diff --git a/pkg/backends/k8s.go b/pkg/backends/k8s.go
@@ -22,9 +22,9 @@ import (
 	"log"
 
 	"github.com/goccy/go-yaml"
-	"github.com/grycap/oscar/v2/pkg/imagepuller"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils"
+	"github.com/grycap/oscar/v3/pkg/imagepuller"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

diff --git a/pkg/backends/k8s_test.go b/pkg/backends/k8s_test.go
@@ -19,7 +19,7 @@ package backends
 import (
 	"testing"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/backends/knative.go b/pkg/backends/knative.go
@@ -24,9 +24,9 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/grycap/oscar/v2/pkg/imagepuller"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils"
+	"github.com/grycap/oscar/v3/pkg/imagepuller"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"

diff --git a/pkg/backends/knative_test.go b/pkg/backends/knative_test.go
@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/backends/openfaas.go b/pkg/backends/openfaas.go
@@ -24,8 +24,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils"
 	ofv1 "github.com/openfaas/faas-netes/pkg/apis/openfaas/v1"
 	ofclientset "github.com/openfaas/faas-netes/pkg/client/clientset/versioned"
 

diff --git a/pkg/backends/serverlessbackend.go b/pkg/backends/serverlessbackend.go
@@ -17,7 +17,7 @@ limitations under the License.
 package backends
 
 import (
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 )

diff --git a/pkg/handlers/config.go b/pkg/handlers/config.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils/auth"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils/auth"
 )
 
 type configForUser struct {

diff --git a/pkg/handlers/create.go b/pkg/handlers/create.go
@@ -30,9 +30,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/gin-gonic/gin"
 	"github.com/grycap/cdmi-client-go"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils"
-	"github.com/grycap/oscar/v2/pkg/utils/auth"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils"
+	"github.com/grycap/oscar/v3/pkg/utils/auth"
 	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
 )
 

diff --git a/pkg/handlers/delete.go b/pkg/handlers/delete.go
@@ -26,9 +26,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils"
-	"github.com/grycap/oscar/v2/pkg/utils/auth"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils"
+	"github.com/grycap/oscar/v3/pkg/utils/auth"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 

diff --git a/pkg/handlers/info.go b/pkg/handlers/info.go
@@ -20,8 +20,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/version"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/version"
 	"k8s.io/client-go/kubernetes"
 )
 

diff --git a/pkg/handlers/info_test.go b/pkg/handlers/info_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/backends"
+	"github.com/grycap/oscar/v3/pkg/backends"
 )
 
 func TestMakeInfoHandler(t *testing.T) {

diff --git a/pkg/handlers/job.go b/pkg/handlers/job.go
@@ -27,8 +27,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
-	"github.com/grycap/oscar/v2/pkg/resourcemanager"
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/resourcemanager"
+	"github.com/grycap/oscar/v3/pkg/types"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"

diff --git a/pkg/handlers/list.go b/pkg/handlers/list.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils/auth"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils/auth"
 )
 
 // MakeListHandler makes a handler for listing services

diff --git a/pkg/handlers/list_test.go b/pkg/handlers/list_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/backends"
+	"github.com/grycap/oscar/v3/pkg/backends"
 )
 
 func TestMakeListHandler(t *testing.T) {

diff --git a/pkg/handlers/logs.go b/pkg/handlers/logs.go
@@ -24,8 +24,8 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils/auth"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils/auth"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/handlers/read.go b/pkg/handlers/read.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils/auth"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils/auth"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 

diff --git a/pkg/handlers/read_test.go b/pkg/handlers/read_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/backends"
+	"github.com/grycap/oscar/v3/pkg/backends"
 	k8serr "k8s.io/apimachinery/pkg/api/errors"
 )
 

diff --git a/pkg/handlers/run.go b/pkg/handlers/run.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 

diff --git a/pkg/handlers/run_test.go b/pkg/handlers/run_test.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/backends"
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/backends"
+	"github.com/grycap/oscar/v3/pkg/types"
 	k8serr "k8s.io/apimachinery/pkg/api/errors"
 )
 

diff --git a/pkg/handlers/update.go b/pkg/handlers/update.go
@@ -23,9 +23,9 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils"
-	"github.com/grycap/oscar/v2/pkg/utils/auth"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils"
+	"github.com/grycap/oscar/v3/pkg/utils/auth"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 

diff --git a/pkg/imagepuller/daemonset.go b/pkg/imagepuller/daemonset.go
@@ -28,7 +28,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -57,7 +57,7 @@ type PodCounter struct {
 var pc PodCounter
 var stopper chan struct{}
 
-//Create daemonset
+// Create daemonset
 func CreateDaemonset(cfg *types.Config, service types.Service, kubeClientset kubernetes.Interface) error {
 
 	//Set needed variables
@@ -83,7 +83,7 @@ func CreateDaemonset(cfg *types.Config, service types.Service, kubeClientset kub
 	return nil
 }
 
-//Get daemonset definition
+// Get daemonset definition
 func getDaemonset(cfg *types.Config, service types.Service) *appsv1.DaemonSet {
 	return &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
@@ -120,7 +120,7 @@ func getDaemonset(cfg *types.Config, service types.Service) *appsv1.DaemonSet {
 	}
 }
 
-//Watch pods with a Kubernetes Informer
+// Watch pods with a Kubernetes Informer
 func watchPods(kubeClientset kubernetes.Interface, cfg *types.Config) {
 	stopper = make(chan struct{})
 	defer close(stopper)

diff --git a/pkg/resourcemanager/delegate.go b/pkg/resourcemanager/delegate.go
@@ -29,7 +29,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 )
 
 const (

diff --git a/pkg/resourcemanager/rescheduler.go b/pkg/resourcemanager/rescheduler.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

diff --git a/pkg/resourcemanager/resourcemanager.go b/pkg/resourcemanager/resourcemanager.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
 )

diff --git a/pkg/resourcemanager/resourcemanager_test.go b/pkg/resourcemanager/resourcemanager_test.go
@@ -19,7 +19,7 @@ package resourcemanager
 import (
 	"testing"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	"k8s.io/client-go/kubernetes/fake"
 )
 

diff --git a/pkg/utils/auth/auth.go b/pkg/utils/auth/auth.go
@@ -21,8 +21,8 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/types"
-	"github.com/grycap/oscar/v2/pkg/utils"
+	"github.com/grycap/oscar/v3/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/utils"
 	"k8s.io/client-go/kubernetes"
 )
 

diff --git a/pkg/utils/auth/oidc.go b/pkg/utils/auth/oidc.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/gin-gonic/gin"
-	"github.com/grycap/oscar/v2/pkg/utils"
+	"github.com/grycap/oscar/v3/pkg/utils"
 	"golang.org/x/oauth2"
 	"k8s.io/client-go/kubernetes"
 )

diff --git a/pkg/utils/expose.go b/pkg/utils/expose.go
@@ -22,7 +22,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	apps "k8s.io/api/apps/v1"
 	autos "k8s.io/api/autoscaling/v1"
 	v1 "k8s.io/api/core/v1"

diff --git a/pkg/utils/minio.go b/pkg/utils/minio.go
@@ -24,7 +24,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	"github.com/minio/madmin-go"
 )
 

diff --git a/pkg/utils/of_scaler.go b/pkg/utils/of_scaler.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grycap/oscar/v2/pkg/types"
+	"github.com/grycap/oscar/v3/pkg/types"
 	"github.com/prometheus/client_golang/api"
 	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ import ( @@
     	"strings"
     	"time"
-    	"github.com/grycap/oscar/v2/pkg/types"
+    	"github.com/grycap/oscar/v3/pkg/types"
     )
     const (
@@ Expand Down @@