clean database models directory (#8026)

pull/7927/head^2
Prabhat Khera 2022-11-14 08:33:57 +13:00 committed by GitHub
parent 881e99df53
commit 6775c7b6ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 12 additions and 12 deletions

View File

@ -8,8 +8,8 @@ import (
"github.com/portainer/libhttp/request" "github.com/portainer/libhttp/request"
"github.com/portainer/libhttp/response" "github.com/portainer/libhttp/response"
portainer "github.com/portainer/portainer/api" portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/database/models"
portainerDsErrors "github.com/portainer/portainer/api/dataservices/errors" 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 { func (handler *Handler) getKubernetesIngressControllers(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {

View File

@ -7,7 +7,7 @@ import (
httperror "github.com/portainer/libhttp/error" httperror "github.com/portainer/libhttp/error"
"github.com/portainer/libhttp/request" "github.com/portainer/libhttp/request"
"github.com/portainer/libhttp/response" "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 { func (handler *Handler) getKubernetesNamespaces(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {

View File

@ -7,7 +7,7 @@ import (
httperror "github.com/portainer/libhttp/error" httperror "github.com/portainer/libhttp/error"
"github.com/portainer/libhttp/request" "github.com/portainer/libhttp/request"
"github.com/portainer/libhttp/response" "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 { func (handler *Handler) getKubernetesServices(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {

View File

@ -1,4 +1,4 @@
package models package kubernetes
type ( type (
K8sConfigMapOrSecret struct { K8sConfigMapOrSecret struct {

View File

@ -1,4 +1,4 @@
package models package kubernetes
import ( import (
"errors" "errors"

View File

@ -1,4 +1,4 @@
package models package kubernetes
import "net/http" import "net/http"

View File

@ -1,4 +1,4 @@
package models package kubernetes
import ( import (
"errors" "errors"

View File

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )

View File

@ -4,7 +4,7 @@ import (
"context" "context"
"strings" "strings"
"github.com/portainer/portainer/api/database/models" models "github.com/portainer/portainer/api/http/models/kubernetes"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
netv1 "k8s.io/api/networking/v1" netv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

View File

@ -7,7 +7,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
portainer "github.com/portainer/portainer/api" 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" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )

View File

@ -3,7 +3,7 @@ package cli
import ( import (
"context" "context"
models "github.com/portainer/portainer/api/database/models" models "github.com/portainer/portainer/api/http/models/kubernetes"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"

View File

@ -7,8 +7,8 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/volume" "github.com/docker/docker/api/types/volume"
"github.com/portainer/portainer/api/database/models"
gittypes "github.com/portainer/portainer/api/git/types" gittypes "github.com/portainer/portainer/api/git/types"
models "github.com/portainer/portainer/api/http/models/kubernetes"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
) )