Skip to content

Commit

Permalink
reference to konstruct
Browse files Browse the repository at this point in the history
  • Loading branch information
@jokestax
jokestax committed Aug 28, 2024
1 parent 14d2118 commit 2d7b8f2
Show file tree
Hide file tree
Showing 53 changed files with 229 additions and 224 deletions.
6 changes: 3 additions & 3 deletions cmd/akamai/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package akamai
import (
"fmt"

"github.com/kubefirst/kubefirst-api/pkg/constants"
"github.com/kubefirst/kubefirst/internal/common"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst-api/pkg/constants"
"github.com/konstructio/kubefirst/internal/common"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/spf13/cobra"
)

Expand Down
18 changes: 9 additions & 9 deletions cmd/akamai/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import (
"os"
"strings"

internalssh "github.com/kubefirst/kubefirst-api/pkg/ssh"
pkg "github.com/kubefirst/kubefirst-api/pkg/utils"
"github.com/kubefirst/kubefirst/internal/catalog"
"github.com/kubefirst/kubefirst/internal/cluster"
"github.com/kubefirst/kubefirst/internal/gitShim"
"github.com/kubefirst/kubefirst/internal/launch"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/kubefirst/kubefirst/internal/provision"
"github.com/kubefirst/kubefirst/internal/utilities"
internalssh "github.com/konstructio/kubefirst-api/pkg/ssh"
pkg "github.com/konstructio/kubefirst-api/pkg/utils"
"github.com/konstructio/kubefirst/internal/catalog"
"github.com/konstructio/kubefirst/internal/cluster"
"github.com/konstructio/kubefirst/internal/gitShim"
"github.com/konstructio/kubefirst/internal/launch"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/konstructio/kubefirst/internal/provision"
"github.com/konstructio/kubefirst/internal/utilities"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
6 changes: 3 additions & 3 deletions cmd/aws/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package aws
import (
"fmt"

"github.com/kubefirst/kubefirst-api/pkg/constants"
"github.com/kubefirst/kubefirst/internal/common"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst-api/pkg/constants"
"github.com/konstructio/kubefirst/internal/common"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/spf13/cobra"
)

Expand Down
20 changes: 10 additions & 10 deletions cmd/aws/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ import (
"strings"

"github.com/aws/aws-sdk-go/aws"
awsinternal "github.com/kubefirst/kubefirst-api/pkg/aws"
internalssh "github.com/kubefirst/kubefirst-api/pkg/ssh"
pkg "github.com/kubefirst/kubefirst-api/pkg/utils"
"github.com/kubefirst/kubefirst/internal/catalog"
"github.com/kubefirst/kubefirst/internal/cluster"
"github.com/kubefirst/kubefirst/internal/gitShim"
"github.com/kubefirst/kubefirst/internal/launch"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/kubefirst/kubefirst/internal/provision"
"github.com/kubefirst/kubefirst/internal/utilities"
awsinternal "github.com/konstructio/kubefirst-api/pkg/aws"
internalssh "github.com/konstructio/kubefirst-api/pkg/ssh"
pkg "github.com/konstructio/kubefirst-api/pkg/utils"
"github.com/konstructio/kubefirst/internal/catalog"
"github.com/konstructio/kubefirst/internal/cluster"
"github.com/konstructio/kubefirst/internal/gitShim"
"github.com/konstructio/kubefirst/internal/launch"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/konstructio/kubefirst/internal/provision"
"github.com/konstructio/kubefirst/internal/utilities"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
4 changes: 2 additions & 2 deletions cmd/aws/quota.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"fmt"
"strings"

awsinternal "github.com/kubefirst/kubefirst-api/pkg/aws"
"github.com/kubefirst/kubefirst-api/pkg/reports"
awsinternal "github.com/konstructio/kubefirst-api/pkg/aws"
"github.com/konstructio/kubefirst-api/pkg/reports"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/beta.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ package cmd
import (
"fmt"

"github.com/kubefirst/kubefirst/cmd/akamai"
"github.com/kubefirst/kubefirst/cmd/google"
"github.com/kubefirst/kubefirst/cmd/k3s"
"github.com/kubefirst/kubefirst/cmd/vultr"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst/cmd/akamai"
"github.com/konstructio/kubefirst/cmd/google"
"github.com/konstructio/kubefirst/cmd/k3s"
"github.com/konstructio/kubefirst/cmd/vultr"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/civo/backup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package civo
import (
"os"

"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
"github.com/kubefirst/kubefirst-api/pkg/ssl"
utils "github.com/kubefirst/kubefirst-api/pkg/utils"
"github.com/konstructio/kubefirst-api/pkg/providerConfigs"
"github.com/konstructio/kubefirst-api/pkg/ssl"
utils "github.com/konstructio/kubefirst-api/pkg/utils"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
6 changes: 3 additions & 3 deletions cmd/civo/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package civo
import (
"fmt"

"github.com/kubefirst/kubefirst-api/pkg/constants"
"github.com/kubefirst/kubefirst/internal/common"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst-api/pkg/constants"
"github.com/konstructio/kubefirst/internal/common"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/spf13/cobra"
)

Expand Down
18 changes: 9 additions & 9 deletions cmd/civo/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import (
"os"
"strings"

internalssh "github.com/kubefirst/kubefirst-api/pkg/ssh"
utils "github.com/kubefirst/kubefirst-api/pkg/utils"
"github.com/kubefirst/kubefirst/internal/catalog"
"github.com/kubefirst/kubefirst/internal/cluster"
"github.com/kubefirst/kubefirst/internal/gitShim"
"github.com/kubefirst/kubefirst/internal/launch"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/kubefirst/kubefirst/internal/provision"
"github.com/kubefirst/kubefirst/internal/utilities"
internalssh "github.com/konstructio/kubefirst-api/pkg/ssh"
utils "github.com/konstructio/kubefirst-api/pkg/utils"
"github.com/konstructio/kubefirst/internal/catalog"
"github.com/konstructio/kubefirst/internal/cluster"
"github.com/konstructio/kubefirst/internal/gitShim"
"github.com/konstructio/kubefirst/internal/launch"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/konstructio/kubefirst/internal/provision"
"github.com/konstructio/kubefirst/internal/utilities"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion cmd/civo/quota.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/civo/civogo"
"github.com/fatih/color"
"github.com/kubefirst/kubefirst-api/pkg/reports"
"github.com/konstructio/kubefirst-api/pkg/reports"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/digitalocean/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package digitalocean
import (
"fmt"

"github.com/kubefirst/kubefirst-api/pkg/constants"
"github.com/kubefirst/kubefirst/internal/common"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst-api/pkg/constants"
"github.com/konstructio/kubefirst/internal/common"
"github.com/konstructio/kubefirst/internal/progress"

"github.com/spf13/cobra"
)
Expand Down
18 changes: 9 additions & 9 deletions cmd/digitalocean/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import (
"os"
"strings"

internalssh "github.com/kubefirst/kubefirst-api/pkg/ssh"
utils "github.com/kubefirst/kubefirst-api/pkg/utils"
"github.com/kubefirst/kubefirst/internal/catalog"
"github.com/kubefirst/kubefirst/internal/cluster"
"github.com/kubefirst/kubefirst/internal/gitShim"
"github.com/kubefirst/kubefirst/internal/launch"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/kubefirst/kubefirst/internal/provision"
"github.com/kubefirst/kubefirst/internal/utilities"
internalssh "github.com/konstructio/kubefirst-api/pkg/ssh"
utils "github.com/konstructio/kubefirst-api/pkg/utils"
"github.com/konstructio/kubefirst/internal/catalog"
"github.com/konstructio/kubefirst/internal/cluster"
"github.com/konstructio/kubefirst/internal/gitShim"
"github.com/konstructio/kubefirst/internal/launch"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/konstructio/kubefirst/internal/provision"
"github.com/konstructio/kubefirst/internal/utilities"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
6 changes: 3 additions & 3 deletions cmd/google/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package google
import (
"fmt"

"github.com/kubefirst/kubefirst-api/pkg/constants"
"github.com/kubefirst/kubefirst/internal/common"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst-api/pkg/constants"
"github.com/konstructio/kubefirst/internal/common"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/spf13/cobra"
)

Expand Down
18 changes: 9 additions & 9 deletions cmd/google/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import (
"os"
"strings"

internalssh "github.com/kubefirst/kubefirst-api/pkg/ssh"
utils "github.com/kubefirst/kubefirst-api/pkg/utils"
"github.com/kubefirst/kubefirst/internal/catalog"
"github.com/kubefirst/kubefirst/internal/cluster"
"github.com/kubefirst/kubefirst/internal/gitShim"
"github.com/kubefirst/kubefirst/internal/launch"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/kubefirst/kubefirst/internal/provision"
"github.com/kubefirst/kubefirst/internal/utilities"
internalssh "github.com/konstructio/kubefirst-api/pkg/ssh"
utils "github.com/konstructio/kubefirst-api/pkg/utils"
"github.com/konstructio/kubefirst/internal/catalog"
"github.com/konstructio/kubefirst/internal/cluster"
"github.com/konstructio/kubefirst/internal/gitShim"
"github.com/konstructio/kubefirst/internal/launch"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/konstructio/kubefirst/internal/provision"
"github.com/konstructio/kubefirst/internal/utilities"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
4 changes: 2 additions & 2 deletions cmd/info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package cmd
import (
"runtime"

"github.com/kubefirst/kubefirst-api/pkg/configs"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst-api/pkg/configs"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/k3d/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package k3d
import (
"fmt"

"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/spf13/cobra"
)

Expand Down
59 changes: 32 additions & 27 deletions cmd/k3d/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@ import (
argocdapi "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
"github.com/go-git/go-git/v5"
githttps "github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/kubefirst/kubefirst-api/pkg/configs"
constants "github.com/kubefirst/kubefirst-api/pkg/constants"
"github.com/kubefirst/kubefirst-api/pkg/gitClient"
"github.com/kubefirst/kubefirst-api/pkg/handlers"
"github.com/kubefirst/kubefirst-api/pkg/reports"
"github.com/kubefirst/kubefirst-api/pkg/types"
utils "github.com/kubefirst/kubefirst-api/pkg/utils"

"github.com/kubefirst/kubefirst-api/pkg/argocd"
github "github.com/kubefirst/kubefirst-api/pkg/github"
gitlab "github.com/kubefirst/kubefirst-api/pkg/gitlab"
"github.com/kubefirst/kubefirst-api/pkg/k3d"
"github.com/kubefirst/kubefirst-api/pkg/k8s"
"github.com/kubefirst/kubefirst-api/pkg/progressPrinter"
"github.com/kubefirst/kubefirst-api/pkg/services"
internalssh "github.com/kubefirst/kubefirst-api/pkg/ssh"
"github.com/kubefirst/kubefirst-api/pkg/terraform"
"github.com/kubefirst/kubefirst-api/pkg/wrappers"
"github.com/kubefirst/kubefirst/internal/catalog"
"github.com/kubefirst/kubefirst/internal/gitShim"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/kubefirst/kubefirst/internal/segment"
"github.com/kubefirst/kubefirst/internal/utilities"
"github.com/konstructio/kubefirst-api/pkg/configs"
constants "github.com/konstructio/kubefirst-api/pkg/constants"
"github.com/konstructio/kubefirst-api/pkg/gitClient"
"github.com/konstructio/kubefirst-api/pkg/handlers"
"github.com/konstructio/kubefirst-api/pkg/reports"
"github.com/konstructio/kubefirst-api/pkg/types"
utils "github.com/konstructio/kubefirst-api/pkg/utils"

"github.com/konstructio/kubefirst-api/pkg/argocd"
github "github.com/konstructio/kubefirst-api/pkg/github"
gitlab "github.com/konstructio/kubefirst-api/pkg/gitlab"
"github.com/konstructio/kubefirst-api/pkg/k3d"
"github.com/konstructio/kubefirst-api/pkg/k8s"
"github.com/konstructio/kubefirst-api/pkg/progressPrinter"
"github.com/konstructio/kubefirst-api/pkg/services"
internalssh "github.com/konstructio/kubefirst-api/pkg/ssh"
"github.com/konstructio/kubefirst-api/pkg/terraform"
"github.com/konstructio/kubefirst-api/pkg/wrappers"
"github.com/konstructio/kubefirst/internal/catalog"
"github.com/konstructio/kubefirst/internal/gitShim"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/konstructio/kubefirst/internal/segment"
"github.com/konstructio/kubefirst/internal/utilities"
"github.com/kubefirst/metrics-client/pkg/telemetry"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
Expand Down Expand Up @@ -902,9 +902,8 @@ func runK3d(cmd *cobra.Command, args []string) error {
progressPrinter.AddTracker("installing-argo-cd", "Installing and configuring Argo CD", 3)
progressPrinter.SetupProgress(progressPrinter.TotalOfTrackers(), false)

argoCDInstallPath := fmt.Sprintf("github.com:kubefirst/manifests/argocd/k3d?ref=%s", constants.KubefirstManifestRepoRef)

//* install argocd
argoCDInstallPath := fmt.Sprintf("github.com:konstructio/manifests/argocd/k3d?ref=%s", constants.KubefirstManifestRepoRef)
//* install argo
executionControl = viper.GetBool("kubefirst-checks.argocd-install")
if !executionControl {
telemetry.SendEvent(segClient, telemetry.ArgoCDInstallStarted, "")
Expand Down Expand Up @@ -1035,7 +1034,13 @@ func runK3d(cmd *cobra.Command, args []string) error {
log.Info().Msg("applying the registry application to argocd")
registryApplicationObject := argocd.GetArgoCDApplicationObject(gitopsRepoURL, fmt.Sprintf("registry/%s", clusterNameFlag))

_, _ = argocdClient.ArgoprojV1alpha1().Applications("argocd").Create(context.Background(), registryApplicationObject, metav1.CreateOptions{})
_, err = argocdClient.ArgoprojV1alpha1().Applications("argocd").Create(context.Background(), registryApplicationObject, metav1.CreateOptions{})

if err != nil {
return fmt.Errorf("error creating argocd application : %w", err)
}

log.Info().Msg("Argo CD application created successfully\n")
viper.Set("kubefirst-checks.argocd-create-registry", true)
viper.WriteConfig()
telemetry.SendEvent(segClient, telemetry.CreateRegistryCompleted, "")
Expand Down
18 changes: 9 additions & 9 deletions cmd/k3d/destroy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import (
"strings"
"time"

constants "github.com/kubefirst/kubefirst-api/pkg/constants"
utils "github.com/kubefirst/kubefirst-api/pkg/utils"

gitlab "github.com/kubefirst/kubefirst-api/pkg/gitlab"
"github.com/kubefirst/kubefirst-api/pkg/k3d"
"github.com/kubefirst/kubefirst-api/pkg/k8s"
"github.com/kubefirst/kubefirst-api/pkg/progressPrinter"
"github.com/kubefirst/kubefirst-api/pkg/terraform"
"github.com/kubefirst/kubefirst/internal/progress"
constants "github.com/konstructio/kubefirst-api/pkg/constants"
utils "github.com/konstructio/kubefirst-api/pkg/utils"

gitlab "github.com/konstructio/kubefirst-api/pkg/gitlab"
"github.com/konstructio/kubefirst-api/pkg/k3d"
"github.com/konstructio/kubefirst-api/pkg/k8s"
"github.com/konstructio/kubefirst-api/pkg/progressPrinter"
"github.com/konstructio/kubefirst-api/pkg/terraform"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
8 changes: 4 additions & 4 deletions cmd/k3d/mkcert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ package k3d
import (
"fmt"

"github.com/kubefirst/kubefirst-api/pkg/k3d"
"github.com/kubefirst/kubefirst-api/pkg/k8s"
utils "github.com/kubefirst/kubefirst-api/pkg/utils"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst-api/pkg/k3d"
"github.com/konstructio/kubefirst-api/pkg/k8s"
utils "github.com/konstructio/kubefirst-api/pkg/utils"
"github.com/konstructio/kubefirst/internal/progress"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
8 changes: 4 additions & 4 deletions cmd/k3d/root-credentials.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ package k3d
import (
"fmt"

"github.com/kubefirst/kubefirst-api/pkg/credentials"
"github.com/kubefirst/kubefirst-api/pkg/k3d"
"github.com/kubefirst/kubefirst-api/pkg/k8s"
"github.com/kubefirst/kubefirst/internal/progress"
"github.com/konstructio/kubefirst-api/pkg/credentials"
"github.com/konstructio/kubefirst-api/pkg/k3d"
"github.com/konstructio/kubefirst-api/pkg/k8s"
"github.com/konstructio/kubefirst/internal/progress"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
Loading

0 comments on commit 2d7b8f2

Please sign in to comment.