diff --git a/api/http/handler/kubernetes/ingresses.go b/api/http/handler/kubernetes/ingresses.go index 292295cf3..6c8c900fc 100644 --- a/api/http/handler/kubernetes/ingresses.go +++ b/api/http/handler/kubernetes/ingresses.go @@ -8,8 +8,8 @@ import ( "github.com/portainer/libhttp/request" "github.com/portainer/libhttp/response" portainer "github.com/portainer/portainer/api" - "github.com/portainer/portainer/api/database/models" portainerDsErrors "github.com/portainer/portainer/api/dataservices/errors" + models "github.com/portainer/portainer/api/http/models/kubernetes" ) func (handler *Handler) getKubernetesIngressControllers(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { diff --git a/api/http/handler/kubernetes/namespaces.go b/api/http/handler/kubernetes/namespaces.go index d2e4d0c17..5f049ad5e 100644 --- a/api/http/handler/kubernetes/namespaces.go +++ b/api/http/handler/kubernetes/namespaces.go @@ -7,7 +7,7 @@ import ( httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" "github.com/portainer/libhttp/response" - "github.com/portainer/portainer/api/database/models" + models "github.com/portainer/portainer/api/http/models/kubernetes" ) func (handler *Handler) getKubernetesNamespaces(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { diff --git a/api/http/handler/kubernetes/services.go b/api/http/handler/kubernetes/services.go index 0cc223eb9..80dfed767 100644 --- a/api/http/handler/kubernetes/services.go +++ b/api/http/handler/kubernetes/services.go @@ -7,7 +7,7 @@ import ( httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" "github.com/portainer/libhttp/response" - "github.com/portainer/portainer/api/database/models" + models "github.com/portainer/portainer/api/http/models/kubernetes" ) func (handler *Handler) getKubernetesServices(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { diff --git a/api/database/models/configmaps_and_secrets.go b/api/http/models/kubernetes/configmaps_and_secrets.go similarity index 96% rename from api/database/models/configmaps_and_secrets.go rename to api/http/models/kubernetes/configmaps_and_secrets.go index 3b1c827ea..eddff7c47 100644 --- a/api/database/models/configmaps_and_secrets.go +++ b/api/http/models/kubernetes/configmaps_and_secrets.go @@ -1,4 +1,4 @@ -package models +package kubernetes type ( K8sConfigMapOrSecret struct { diff --git a/api/database/models/ingress.go b/api/http/models/kubernetes/ingress.go similarity index 99% rename from api/database/models/ingress.go rename to api/http/models/kubernetes/ingress.go index 8e4f59886..ef41df2b9 100644 --- a/api/database/models/ingress.go +++ b/api/http/models/kubernetes/ingress.go @@ -1,4 +1,4 @@ -package models +package kubernetes import ( "errors" diff --git a/api/database/models/namespaces.go b/api/http/models/kubernetes/namespaces.go similarity index 92% rename from api/database/models/namespaces.go rename to api/http/models/kubernetes/namespaces.go index 62195e2ae..ca824ae8a 100644 --- a/api/database/models/namespaces.go +++ b/api/http/models/kubernetes/namespaces.go @@ -1,4 +1,4 @@ -package models +package kubernetes import "net/http" diff --git a/api/database/models/services.go b/api/http/models/kubernetes/services.go similarity index 99% rename from api/database/models/services.go rename to api/http/models/kubernetes/services.go index 72d12cc4e..86ab625fd 100644 --- a/api/database/models/services.go +++ b/api/http/models/kubernetes/services.go @@ -1,4 +1,4 @@ -package models +package kubernetes import ( "errors" diff --git a/api/kubernetes/cli/configmaps_and_secrets.go b/api/kubernetes/cli/configmaps_and_secrets.go index e460c96c2..d6f8c3b5a 100644 --- a/api/kubernetes/cli/configmaps_and_secrets.go +++ b/api/kubernetes/cli/configmaps_and_secrets.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/portainer/portainer/api/database/models" + models "github.com/portainer/portainer/api/http/models/kubernetes" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/api/kubernetes/cli/ingress.go b/api/kubernetes/cli/ingress.go index cc46038bb..1f3266340 100644 --- a/api/kubernetes/cli/ingress.go +++ b/api/kubernetes/cli/ingress.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/portainer/portainer/api/database/models" + models "github.com/portainer/portainer/api/http/models/kubernetes" "github.com/rs/zerolog/log" netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/kubernetes/cli/namespace.go b/api/kubernetes/cli/namespace.go index 0baacf09a..2db295913 100644 --- a/api/kubernetes/cli/namespace.go +++ b/api/kubernetes/cli/namespace.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" portainer "github.com/portainer/portainer/api" - "github.com/portainer/portainer/api/database/models" + models "github.com/portainer/portainer/api/http/models/kubernetes" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/api/kubernetes/cli/service.go b/api/kubernetes/cli/service.go index 6cfb53f8b..fa6b507fd 100644 --- a/api/kubernetes/cli/service.go +++ b/api/kubernetes/cli/service.go @@ -3,7 +3,7 @@ package cli import ( "context" - models "github.com/portainer/portainer/api/database/models" + models "github.com/portainer/portainer/api/http/models/kubernetes" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/api/portainer.go b/api/portainer.go index dcd6a3717..b418052b4 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -7,8 +7,8 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/volume" - "github.com/portainer/portainer/api/database/models" gittypes "github.com/portainer/portainer/api/git/types" + models "github.com/portainer/portainer/api/http/models/kubernetes" v1 "k8s.io/api/core/v1" )