Skip to content

Commit

Permalink
shipa-corp/ketch -> theketchio/ketch (theketchio#189)
Browse files Browse the repository at this point in the history
  • Loading branch information
aleksej-paschenko authored Nov 5, 2021
1 parent 4281760 commit 883f032
Show file tree
Hide file tree
Showing 87 changed files with 192 additions and 192 deletions.
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
FROM golang:1.17 as builder

# Copy the Go Modules manifests
COPY go.mod /go/src/github.com/shipa-corp/ketch/go.mod
COPY go.sum /go/src/github.com/shipa-corp/ketch/go.sum
COPY go.mod /go/src/github.com/theketchio/ketch/go.mod
COPY go.sum /go/src/github.com/theketchio/ketch/go.sum

WORKDIR /go/src/github.com/shipa-corp/ketch/
WORKDIR /go/src/github.com/theketchio/ketch/

# cache deps before building and copying source so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer
RUN go mod download

# Copy the go source
COPY cmd/ /go/src/github.com/shipa-corp/ketch/cmd/
COPY internal/ /go/src/github.com/shipa-corp/ketch/internal/
COPY Makefile /go/src/github.com/shipa-corp/ketch/
COPY cmd/ /go/src/github.com/theketchio/ketch/cmd/
COPY internal/ /go/src/github.com/theketchio/ketch/internal/
COPY Makefile /go/src/github.com/theketchio/ketch/

# Build
RUN make generate
Expand All @@ -24,5 +24,5 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager cmd/manager/mai
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/static:nonroot
WORKDIR /
COPY --from=builder /go/src/github.com/shipa-corp/ketch/manager .
COPY --from=builder /go/src/github.com/theketchio/ketch/manager .
USER nonroot:nonroot
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
domain: theketch.io
repo: github.com/shipa-corp/ketch
repo: github.com/theketchio/ketch
resources:
- group: resources
kind: App
Expand Down
6 changes: 3 additions & 3 deletions ci/ketch-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if [ -z "$DOCKER_IMAGE" ]; then usage "Image for the app is required"; fi;

# set default ketch tag if not set by user
if [ -z "$KETCH_TAG" ]; then
KETCH_TAG=$(curl -s https://api.github.com/repos/shipa-corp/ketch/releases/latest | grep -Eo '"tag_name":.*[^\\]",' | head -n 1 | sed 's/[," ]//g' | cut -d ':' -f 2)
KETCH_TAG=$(curl -s https://api.github.com/repos/theketchio/ketch/releases/latest | grep -Eo '"tag_name":.*[^\\]",' | head -n 1 | sed 's/[," ]//g' | cut -d ':' -f 2)
fi

# set default ingress type if not set by user
Expand Down Expand Up @@ -118,13 +118,13 @@ if [ "$INGRESS_TYPE" = "traefik" ]; then
fi

# Install ketch binary at /usr/local/bin default location
curl -s https://raw.githubusercontent.com/shipa-corp/ketch/main/install.sh | TAG="${KETCH_TAG}" bash
curl -s https://raw.githubusercontent.com/theketchio/ketch/main/install.sh | TAG="${KETCH_TAG}" bash

# Install Ketch controller if not already installed or not in running state
if [[ -z "$(kubectl get ns | grep ketch-system)" ]] || [[ $(kubectl get pods --field-selector=status.phase=Running -n ketch-system | grep ketch | wc -l | xargs) -eq 0 ]]; then
echo "ketch controller not found or not in running state!"
echo "installing ketch controller..."
kubectl apply -f https://github.com/shipa-corp/ketch/releases/download/"${KETCH_TAG}"/ketch-controller.yaml
kubectl apply -f https://github.com/theketchio/ketch/releases/download/"${KETCH_TAG}"/ketch-controller.yaml
fi

ensure_resource 'ketch-controller-manager' 1
Expand Down
8 changes: 4 additions & 4 deletions cmd/ketch/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/spf13/cobra"
apiv1 "k8s.io/api/core/v1"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/build"
"github.com/shipa-corp/ketch/internal/deploy"
"github.com/shipa-corp/ketch/internal/pack"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/build"
"github.com/theketchio/ketch/internal/deploy"
"github.com/theketchio/ketch/internal/pack"
)

func newAppCmd(cfg config, out io.Writer, packSvc *pack.Client, configDefaultBuilder string) *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/app_deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"github.com/spf13/cobra"

"github.com/shipa-corp/ketch/internal/deploy"
"github.com/shipa-corp/ketch/internal/validation"
"github.com/theketchio/ketch/internal/deploy"
"github.com/theketchio/ketch/internal/validation"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions cmd/ketch/app_deploy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"k8s.io/client-go/kubernetes/fake"
"sigs.k8s.io/controller-runtime/pkg/client"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/build"
"github.com/shipa-corp/ketch/internal/deploy"
"github.com/shipa-corp/ketch/internal/pack"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/build"
"github.com/theketchio/ketch/internal/deploy"
"github.com/theketchio/ketch/internal/pack"
)

type getterCreatorMockFn func(m *mockClient, obj runtime.Object) error
Expand Down
6 changes: 3 additions & 3 deletions cmd/ketch/app_export.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

"github.com/shipa-corp/ketch/cmd/ketch/output"
ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/deploy"
"github.com/theketchio/ketch/cmd/ketch/output"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/deploy"
)

const appExportHelp = `
Expand Down
8 changes: 4 additions & 4 deletions cmd/ketch/app_export_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import (
"path/filepath"
"testing"

"github.com/shipa-corp/ketch/internal/utils/conversions"
"github.com/theketchio/ketch/internal/utils/conversions"

"github.com/spf13/pflag"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/mocks"
"github.com/shipa-corp/ketch/internal/templates"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/mocks"
"github.com/theketchio/ketch/internal/templates"
)

func Test_newAppExportCmd(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/ketch/app_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

"github.com/shipa-corp/ketch/cmd/ketch/output"
ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/utils"
"github.com/theketchio/ketch/cmd/ketch/output"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/utils"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/app_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/mocks"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/mocks"
)

func Test_appInfo(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/ketch/app_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/shipa-corp/ketch/cmd/ketch/output"
ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/utils"
"github.com/theketchio/ketch/cmd/ketch/output"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/utils"
)

type appListOutput struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/app_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"reflect"
"testing"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/mocks"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/mocks"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/ketch/app_log.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/utils"
"github.com/shipa-corp/ketch/internal/validation"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/utils"
"github.com/theketchio/ketch/internal/validation"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/ketch/app_log_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
fakerest "k8s.io/client-go/rest/fake"
testclient "k8s.io/client-go/testing"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/mocks"
"github.com/shipa-corp/ketch/internal/utils"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/mocks"
"github.com/theketchio/ketch/internal/utils"
)

func Test_watchLogs(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/app_remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/validation"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/validation"
)

const appRemoveHelp = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/app_start.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/validation"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/validation"
)

const appStartHelp = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/ketch/app_stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
)

const appStopHelp = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/ketch/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/require"
apiv1 "k8s.io/api/core/v1"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
)

func Test_appState(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/auto_completion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/mocks"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/mocks"
)

func Test_autoCompleteAppNames(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/ketch/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/spf13/cobra"

"github.com/shipa-corp/ketch/cmd/ketch/configuration"
"github.com/theketchio/ketch/cmd/ketch/configuration"
)

const builderCmdHelp = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/builder_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/spf13/cobra"

"github.com/shipa-corp/ketch/cmd/ketch/configuration"
"github.com/shipa-corp/ketch/cmd/ketch/output"
"github.com/theketchio/ketch/cmd/ketch/configuration"
"github.com/theketchio/ketch/cmd/ketch/output"
)

const builderListHelp = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/ketch/builder_list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/shipa-corp/ketch/cmd/ketch/configuration"
"github.com/theketchio/ketch/cmd/ketch/configuration"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/ketch/builder_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"github.com/spf13/cobra"

"github.com/shipa-corp/ketch/cmd/ketch/configuration"
"github.com/theketchio/ketch/cmd/ketch/configuration"
)

const builderSetHelp = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/ketch/builder_set_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/BurntSushi/toml"
"github.com/stretchr/testify/require"

"github.com/shipa-corp/ketch/cmd/ketch/configuration"
"github.com/theketchio/ketch/cmd/ketch/configuration"
)

func Test_newBuilderSetCmd(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/ketch/cname_add.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/deploy"
"github.com/shipa-corp/ketch/internal/validation"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/deploy"
"github.com/theketchio/ketch/internal/validation"
)

const cnameAddHelp = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/cname_remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/deploy"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/deploy"
)

const cnameRemoveHelp = `
Expand Down
6 changes: 3 additions & 3 deletions cmd/ketch/configuration/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/controller-runtime/pkg/client"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/controllers"
"github.com/shipa-corp/ketch/internal/templates"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/controllers"
"github.com/theketchio/ketch/internal/templates"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/env_get.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

"github.com/shipa-corp/ketch/cmd/ketch/output"
ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/cmd/ketch/output"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
)

const envGetHelp = `
Expand Down
6 changes: 3 additions & 3 deletions cmd/ketch/env_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/deploy"
"github.com/shipa-corp/ketch/internal/utils"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/deploy"
"github.com/theketchio/ketch/internal/utils"
)

const envSetHelp = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/ketch/env_unset.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
"github.com/shipa-corp/ketch/internal/deploy"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"
"github.com/theketchio/ketch/internal/deploy"
)

const envUnsetHelp = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/ketch/framework.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"io"

ketchv1 "github.com/shipa-corp/ketch/internal/api/v1beta1"
ketchv1 "github.com/theketchio/ketch/internal/api/v1beta1"

"github.com/spf13/cobra"
)
Expand Down
Loading

0 comments on commit 883f032

Please sign in to comment.