Skip to content

Commit

Permalink
feat: runtime migration (#365)
Browse files Browse the repository at this point in the history 
* feat: initial migration

* chore: import updates

* fix: conflicts
  • Loading branch information
@CristhianF7
CristhianF7 authored Jul 11, 2024
1 parent 0ec875d commit 26145f7
Show file tree
Hide file tree
Showing 173 changed files with 11,241 additions and 188 deletions.
4 changes: 2 additions & 2 deletions extensions/akamai/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"strconv"
"strings"

"github.com/kubefirst/kubefirst-api/internal/k8s"
"github.com/kubefirst/kubefirst-api/internal/vault"
"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
"github.com/kubefirst/runtime/pkg/k8s"
"github.com/kubefirst/runtime/pkg/vault"
log "github.com/rs/zerolog/log"
"k8s.io/client-go/kubernetes"
)
Expand Down
4 changes: 2 additions & 2 deletions extensions/aws/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"strconv"
"strings"

"github.com/kubefirst/kubefirst-api/internal/k8s"
"github.com/kubefirst/kubefirst-api/internal/vault"
"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
"github.com/kubefirst/runtime/pkg/k8s"
"github.com/kubefirst/runtime/pkg/vault"
log "github.com/rs/zerolog/log"
"k8s.io/client-go/kubernetes"
)
Expand Down
2 changes: 1 addition & 1 deletion extensions/aws/kubernetes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/eks"
eksTypes "github.com/aws/aws-sdk-go-v2/service/eks/types"
"github.com/kubefirst/runtime/pkg/k8s"
"github.com/kubefirst/kubefirst-api/internal/k8s"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"sigs.k8s.io/aws-iam-authenticator/pkg/token"
Expand Down
2 changes: 1 addition & 1 deletion extensions/aws/secrets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"fmt"
"strings"

"github.com/kubefirst/kubefirst-api/internal/aws"
providerConfig "github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
"github.com/kubefirst/runtime/pkg/aws"
"github.com/rs/zerolog/log"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions extensions/civo/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"strconv"
"strings"

"github.com/kubefirst/kubefirst-api/internal/k8s"
"github.com/kubefirst/kubefirst-api/internal/vault"
"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
"github.com/kubefirst/runtime/pkg/k8s"
"github.com/kubefirst/runtime/pkg/vault"
log "github.com/rs/zerolog/log"
"k8s.io/client-go/kubernetes"
)
Expand Down
4 changes: 2 additions & 2 deletions extensions/digitalocean/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"strconv"
"strings"

"github.com/kubefirst/kubefirst-api/internal/k8s"
"github.com/kubefirst/kubefirst-api/internal/vault"
"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
"github.com/kubefirst/runtime/pkg/k8s"
"github.com/kubefirst/runtime/pkg/vault"
log "github.com/rs/zerolog/log"
"k8s.io/client-go/kubernetes"
)
Expand Down
4 changes: 2 additions & 2 deletions extensions/google/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"strconv"
"strings"

"github.com/kubefirst/kubefirst-api/internal/k8s"
"github.com/kubefirst/kubefirst-api/internal/vault"
"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
"github.com/kubefirst/runtime/pkg/k8s"
"github.com/kubefirst/runtime/pkg/vault"
log "github.com/rs/zerolog/log"
"k8s.io/client-go/kubernetes"
)
Expand Down
4 changes: 2 additions & 2 deletions extensions/k3s/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"strconv"
"strings"

"github.com/kubefirst/kubefirst-api/internal/k8s"
"github.com/kubefirst/kubefirst-api/internal/vault"
"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
"github.com/kubefirst/runtime/pkg/k8s"
"github.com/kubefirst/runtime/pkg/vault"
log "github.com/sirupsen/logrus"
"k8s.io/client-go/kubernetes"
)
Expand Down
4 changes: 2 additions & 2 deletions extensions/vultr/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"strconv"
"strings"

"github.com/kubefirst/kubefirst-api/internal/k8s"
"github.com/kubefirst/kubefirst-api/internal/vault"
"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
"github.com/kubefirst/runtime/pkg/k8s"
"github.com/kubefirst/runtime/pkg/vault"
log "github.com/rs/zerolog/log"
"k8s.io/client-go/kubernetes"
)
Expand Down
58 changes: 32 additions & 26 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ require (
github.com/aws/aws-sdk-go-v2 v1.17.8
github.com/aws/aws-sdk-go-v2/config v1.18.19
github.com/aws/aws-sdk-go-v2/credentials v1.13.18
github.com/aws/aws-sdk-go-v2/service/ec2 v1.91.0
github.com/aws/aws-sdk-go-v2/service/eks v1.27.10
github.com/aws/aws-sdk-go-v2/service/route53 v1.27.5
github.com/caarlos0/env/v10 v10.0.0
Expand All @@ -21,20 +22,21 @@ require (
github.com/charmbracelet/lipgloss v0.9.1
github.com/civo/civogo v0.3.53
github.com/cloudflare/cloudflare-go v0.73.0
github.com/docker/docker v23.0.2+incompatible
github.com/gin-contrib/cors v1.4.0
github.com/gin-gonic/gin v1.8.2
github.com/go-git/go-git/v5 v5.6.1
github.com/google/go-github/v52 v52.0.0
github.com/hashicorp/vault/api v1.9.0
github.com/joho/godotenv v1.5.1
github.com/kubefirst/metrics-client v0.3.0
github.com/kubefirst/runtime v0.4.10
github.com/linode/linodego v1.29.0
github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a
github.com/minio/minio-go/v7 v7.0.49
github.com/nxadm/tail v1.4.8
github.com/otiai10/copy v1.7.0
github.com/rs/zerolog v1.29.1
github.com/segmentio/analytics-go v3.1.0+incompatible
github.com/sirupsen/logrus v1.9.0
github.com/swaggo/files v1.0.0
github.com/swaggo/gin-swagger v1.5.3
Expand All @@ -52,10 +54,14 @@ require (
)

require (
github.com/aws/aws-sdk-go-v2/service/ec2 v1.91.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/go-resty/resty/v2 v2.11.0 // indirect
github.com/segmentio/analytics-go v3.1.0+incompatible // indirect
github.com/go-test/deep v1.0.4 // indirect
github.com/hashicorp/go-hclog v1.3.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gotest.tools/v3 v3.4.0 // indirect
)

replace (
Expand All @@ -77,40 +83,40 @@ require (
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/argoproj/pkg v0.13.7-0.20221221191914-44694015343d // indirect
github.com/aws/aws-sdk-go v1.44.230 // indirect
github.com/aws/aws-sdk-go v1.44.230
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.26 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.32 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.23 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.18.7 // indirect
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.6 // indirect
github.com/aws/aws-sdk-go-v2/service/iam v1.19.8 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.18.7
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.15.6
github.com/aws/aws-sdk-go-v2/service/iam v1.19.8
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.26 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.0 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.20.8 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 // indirect
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.14.7 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.20.8
github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.14.7
github.com/aws/aws-sdk-go-v2/service/sso v1.12.6 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.18.7 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.18.7
github.com/aws/smithy-go v1.13.5 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bombsimon/logrusr/v2 v2.0.1 // indirect
github.com/bradleyfalzon/ghinstallation/v2 v2.1.0 // indirect
github.com/caarlos0/env/v6 v6.10.1 // indirect
github.com/caarlos0/env/v6 v6.10.1
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chai2010/gettext-go v0.1.0 // indirect
github.com/cloudflare/circl v1.1.0 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/digitalocean/godo v1.98.0 // indirect
github.com/digitalocean/godo v1.98.0
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.0 // indirect
Expand All @@ -135,7 +141,7 @@ require (
github.com/go-playground/validator/v10 v10.11.2 // indirect
github.com/go-redis/cache/v8 v8.4.2 // indirect
github.com/go-redis/redis/v8 v8.11.5 // indirect
github.com/go-yaml/yaml v2.1.0+incompatible // indirect
github.com/go-yaml/yaml v2.1.0+incompatible
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-json v0.10.0 // indirect
github.com/gofrs/flock v0.7.0 // indirect
Expand All @@ -146,7 +152,7 @@ require (
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-github/v45 v45.2.0 // indirect
github.com/google/go-github/v45 v45.2.0
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.4 // indirect
Expand All @@ -167,7 +173,7 @@ require (
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jedib0t/go-pretty/v6 v6.4.6 // indirect
github.com/jedib0t/go-pretty/v6 v6.4.6
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -178,7 +184,7 @@ require (
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/lixiangzhong/dnsutil v1.4.0 // indirect
github.com/lixiangzhong/dnsutil v1.4.0
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand Down Expand Up @@ -223,29 +229,29 @@ require (
github.com/skeema/knownhosts v1.1.0 // indirect
github.com/spf13/afero v1.9.3
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/cobra v1.7.0
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.15.0
github.com/subosito/gotenv v1.4.2 // indirect
github.com/ugorji/go/codec v1.2.8 // indirect
github.com/vmihailenco/go-tinylfu v0.2.1 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/vultr/govultr/v3 v3.0.2 // indirect
github.com/xanzy/go-gitlab v0.81.0 // indirect
github.com/vultr/govultr/v3 v3.0.2
github.com/xanzy/go-gitlab v0.81.0
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
go.opencensus.io v0.24.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/crypto v0.20.0
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
golang.org/x/mod v0.13.0 // indirect
golang.org/x/mod v0.13.0
golang.org/x/net v0.21.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.17.0 // indirect
golang.org/x/term v0.17.0
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
Expand Down Expand Up @@ -273,10 +279,10 @@ require (
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/kustomize/api v0.13.2 // indirect
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
sigs.k8s.io/kustomize/kyaml v0.14.1
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/yaml v1.3.0
)

replace (
Expand Down
Loading

0 comments on commit 26145f7

Please sign in to comment.