Skip to content

Commit

Permalink
Update package refs for new repo
Browse files Browse the repository at this point in the history
  • Loading branch information
divolgin committed May 8, 2020
1 parent 38a5943 commit b59904c
Show file tree
Hide file tree
Showing 82 changed files with 236 additions and 236 deletions.
6 changes: 3 additions & 3 deletions kotsadm/.buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ steps:
- docker#v3.5.0:
always-pull: true
image: replicated/gitops-builder:buildkite-go14-node10
workdir: /go/src/github.com/replicatedhq/kotsadm
workdir: /go/src/github.com/replicatedhq/kots/kotsadm
environment:
- SCOPE_DSN_PUBLIC
- BUILDKITE_REPO
Expand All @@ -120,7 +120,7 @@ steps:
- docker#v3.5.0:
always-pull: true
image: replicated/gitops-builder:buildkite-go14-node10
workdir: /go/src/github.com/replicatedhq/kotsadm
workdir: /go/src/github.com/replicatedhq/kots/kotsadm
environment:
- SCOPE_DSN_PUBLIC
- BUILDKITE_REPO
Expand All @@ -144,7 +144,7 @@ steps:
- docker#v3.5.0:
always-pull: true
image: replicated/gitops-builder:buildkite-go14-node10
workdir: /go/src/github.com/replicatedhq/kotsadm
workdir: /go/src/github.com/replicatedhq/kots/kotsadm
environment:
- SCOPE_DSN_PUBLIC
- BUILDKITE_REPO
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BUILDTAGS = containers_image_ostree_stub exclude_graphdriver_devicemapper exclud

.PHONY: kotsadm
kotsadm:
go build -tags "$(BUILDTAGS)" -o bin/kotsadm github.com/replicatedhq/kotsadm/cmd/kotsadm
go build -tags "$(BUILDTAGS)" -o bin/kotsadm github.com/replicatedhq/kots/kotsadm/cmd/kotsadm

.PHONY: fmt
fmt:
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ For more information on installing Kotsadm locally see https://kots.io/kotsadm/i

## Contributing

For docs on setting up a dev environment to build and run kotsadm locally, read the [CONTRIBUTING](https://github.com/replicatedhq/kotsadm/blob/master/CONTRIBUTING.md) guide.
For docs on setting up a dev environment to build and run kotsadm locally, read the [CONTRIBUTING](https://github.com/replicatedhq/kots/kotsadm/blob/master/CONTRIBUTING.md) guide.

# Community

Expand Down
2 changes: 1 addition & 1 deletion kotsadm/cmd/kotsadm/cli/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cli
import (
"strings"

"github.com/replicatedhq/kotsadm/pkg/apiserver"
"github.com/replicatedhq/kots/kotsadm/pkg/apiserver"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/cmd/kotsadm/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/replicatedhq/kotsadm/cmd/kotsadm/cli"
import "github.com/replicatedhq/kots/kotsadm/cmd/kotsadm/cli"

func main() {
cli.InitAndExecute()
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.14 as deps

ENV PROJECTPATH=/go/src/github.com/replicatedhq/kotsadm
ENV PROJECTPATH=/go/src/github.com/replicatedhq/kots/kotsadm
WORKDIR $PROJECTPATH
ADD Makefile $PROJECTPATH/
# ADD go.mod $PROJECTPATH/
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/docs/proposals/graphql-to-rest.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Remove operator and make that part of kotsadm directly as a new command. When ru

## Rest API

Current GraphQL schema is defined: https://github.com/replicatedhq/kotsadm/blob/61e89966eefb76fd02d276d21314389997105818/api/src/schema/query.ts and https://github.com/replicatedhq/kotsadm/blob/61e89966eefb76fd02d276d21314389997105818/api/src/schema/mutation.ts. There are also numerous Rest APIs defined in https://github.com/replicatedhq/kotsadm/tree/61e89966eefb76fd02d276d21314389997105818/api/src/controllers. Some of these are deprecated from Ship, and not needed.
Current GraphQL schema is defined: https://github.com/replicatedhq/kots/kotsadm/blob/61e89966eefb76fd02d276d21314389997105818/api/src/schema/query.ts and https://github.com/replicatedhq/kots/kotsadm/blob/61e89966eefb76fd02d276d21314389997105818/api/src/schema/mutation.ts. There are also numerous Rest APIs defined in https://github.com/replicatedhq/kots/kotsadm/tree/61e89966eefb76fd02d276d21314389997105818/api/src/controllers. Some of these are deprecated from Ship, and not needed.

New Rest API (Go version) will be:

Expand Down
2 changes: 1 addition & 1 deletion kotsadm/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/replicatedhq/kotsadm
module github.com/replicatedhq/kots/kotsadm

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion kotsadm/kurl_proxy/Dockerfile.skaffold
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.14

ENV PROJECTPATH=/go/src/github.com/replicatedhq/kotsadm/kurl_proxy
ENV PROJECTPATH=/go/src/github.com/replicatedhq/kots/kotsadm/kurl_proxy
WORKDIR $PROJECTPATH
ADD Makefile ./
ADD go.mod ./
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/kurl_proxy/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/replicatedhq/kotsadm/kurl_proxy
module github.com/replicatedhq/kots/kotsadm/kurl_proxy

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/Dockerfile.skaffold
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN curl -L "https://github.com/replicatedhq/troubleshoot/releases/download/v${T
cd /tmp && tar xzvf support-bundle.tar.gz && \
mv /tmp/support-bundle /root/.krew/bin/kubectl-support_bundle

ENV PROJECTPATH=/go/src/github.com/replicatedhq/kotsadm/operator
ENV PROJECTPATH=/go/src/github.com/replicatedhq/kots/kotsadm/operator
WORKDIR $PROJECTPATH
ADD Makefile ./
ADD go.mod ./
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ test: fmt vet pacts

.PHONY: build
build:
go build -o bin/kotsadm-operator github.com/replicatedhq/kotsadm/operator/cmd/kotsadm-operator
go build -o bin/kotsadm-operator github.com/replicatedhq/kots/kotsadm/operator/cmd/kotsadm-operator

.PHONY: run
run: bin
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/PROJECT
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version: "1"
domain: replicated.com
repo: github.com/replicatedhq/kotsadm/operator
repo: github.com/replicatedhq/kots/kotsadm/operator
2 changes: 1 addition & 1 deletion kotsadm/operator/cmd/kotsadm-operator/cli/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"strings"

"github.com/replicatedhq/kotsadm/operator/pkg/client"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/client"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/cmd/kotsadm-operator/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/replicatedhq/kotsadm/operator/cmd/kotsadm-operator/cli"
import "github.com/replicatedhq/kots/kotsadm/operator/cmd/kotsadm-operator/cli"

func main() {
cli.InitAndExecute()
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/replicatedhq/kotsadm/operator
module github.com/replicatedhq/kots/kotsadm/operator

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/appstate/appstate.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"time"

"github.com/replicatedhq/kotsadm/operator/pkg/appstate/types"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/appstate/types"
corev1 "k8s.io/api/core/v1"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/appstate/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/replicatedhq/kotsadm/operator/pkg/appstate/types"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/appstate/types"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/appstate/ingress.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/replicatedhq/kotsadm/operator/pkg/appstate/types"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/appstate/types"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/appstate/persistentvolumeclaim.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/replicatedhq/kotsadm/operator/pkg/appstate/types"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/appstate/types"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/appstate/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/replicatedhq/kotsadm/operator/pkg/appstate/types"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/appstate/types"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/appstate/statefulsets.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/replicatedhq/kotsadm/operator/pkg/appstate/types"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/appstate/types"
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/appstate/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package appstate
import (
"sort"

"github.com/replicatedhq/kotsadm/operator/pkg/appstate/types"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/appstate/types"
)

func normalizeStatusInformers(informers []types.StatusInformer, targetNamespace string) (next []types.StatusInformer) {
Expand Down
12 changes: 6 additions & 6 deletions kotsadm/operator/pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (

"github.com/mitchellh/hashstructure"
"github.com/pkg/errors"
"github.com/replicatedhq/kotsadm/operator/pkg/applier"
"github.com/replicatedhq/kotsadm/operator/pkg/appstate"
"github.com/replicatedhq/kotsadm/operator/pkg/appstate/types"
"github.com/replicatedhq/kotsadm/operator/pkg/socket"
"github.com/replicatedhq/kotsadm/operator/pkg/socket/transport"
"github.com/replicatedhq/kotsadm/operator/pkg/util"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/applier"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/appstate"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/appstate/types"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/socket"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/socket/transport"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/util"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
)
Expand Down
4 changes: 2 additions & 2 deletions kotsadm/operator/pkg/client/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

"github.com/pkg/errors"
"github.com/replicatedhq/kotsadm/operator/pkg/applier"
"github.com/replicatedhq/kotsadm/operator/pkg/util"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/applier"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/util"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/socket/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strconv"

"github.com/replicatedhq/kotsadm/operator/pkg/socket/transport"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/socket/transport"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/socket/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"sync"

"github.com/replicatedhq/kotsadm/operator/pkg/socket/protocol"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/socket/protocol"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions kotsadm/operator/pkg/socket/loop.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sync"
"time"

"github.com/replicatedhq/kotsadm/operator/pkg/socket/protocol"
"github.com/replicatedhq/kotsadm/operator/pkg/socket/transport"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/socket/protocol"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/socket/transport"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion kotsadm/operator/pkg/socket/send.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package socket
import (
"encoding/json"
"errors"
"github.com/replicatedhq/kotsadm/operator/pkg/socket/protocol"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/socket/protocol"
"log"
"time"
)
Expand Down
4 changes: 2 additions & 2 deletions kotsadm/operator/pkg/socket/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"sync"
"time"

"github.com/replicatedhq/kotsadm/operator/pkg/socket/protocol"
"github.com/replicatedhq/kotsadm/operator/pkg/socket/transport"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/socket/protocol"
"github.com/replicatedhq/kots/kotsadm/operator/pkg/socket/transport"
)

const (
Expand Down
12 changes: 6 additions & 6 deletions kotsadm/pkg/airgap/airgap.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
"github.com/pkg/errors"
kotsv1beta1 "github.com/replicatedhq/kots/kotskinds/apis/kots/v1beta1"
"github.com/replicatedhq/kots/pkg/pull"
"github.com/replicatedhq/kotsadm/pkg/app"
"github.com/replicatedhq/kotsadm/pkg/logger"
"github.com/replicatedhq/kotsadm/pkg/persistence"
"github.com/replicatedhq/kotsadm/pkg/registry"
"github.com/replicatedhq/kotsadm/pkg/task"
"github.com/replicatedhq/kotsadm/pkg/version"
"github.com/replicatedhq/kots/kotsadm/pkg/app"
"github.com/replicatedhq/kots/kotsadm/pkg/logger"
"github.com/replicatedhq/kots/kotsadm/pkg/persistence"
"github.com/replicatedhq/kots/kotsadm/pkg/registry"
"github.com/replicatedhq/kots/kotsadm/pkg/task"
"github.com/replicatedhq/kots/kotsadm/pkg/version"
"k8s.io/client-go/kubernetes/scheme"
)

Expand Down
14 changes: 7 additions & 7 deletions kotsadm/pkg/airgap/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import (
"github.com/replicatedhq/kots/pkg/crypto"
"github.com/replicatedhq/kots/pkg/cursor"
"github.com/replicatedhq/kots/pkg/pull"
"github.com/replicatedhq/kotsadm/pkg/app"
"github.com/replicatedhq/kotsadm/pkg/kotsutil"
"github.com/replicatedhq/kotsadm/pkg/logger"
"github.com/replicatedhq/kotsadm/pkg/preflight"
"github.com/replicatedhq/kotsadm/pkg/registry"
"github.com/replicatedhq/kotsadm/pkg/task"
"github.com/replicatedhq/kotsadm/pkg/version"
"github.com/replicatedhq/kots/kotsadm/pkg/app"
"github.com/replicatedhq/kots/kotsadm/pkg/kotsutil"
"github.com/replicatedhq/kots/kotsadm/pkg/logger"
"github.com/replicatedhq/kots/kotsadm/pkg/preflight"
"github.com/replicatedhq/kots/kotsadm/pkg/registry"
"github.com/replicatedhq/kots/kotsadm/pkg/task"
"github.com/replicatedhq/kots/kotsadm/pkg/version"
)

func UpdateAppFromAirgap(a *app.App, airgapBundle multipart.File) error {
Expand Down
6 changes: 3 additions & 3 deletions kotsadm/pkg/apiserver/depends.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
awssession "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/pkg/errors"
"github.com/replicatedhq/kotsadm/pkg/logger"
"github.com/replicatedhq/kotsadm/pkg/persistence"
kotss3 "github.com/replicatedhq/kotsadm/pkg/s3"
"github.com/replicatedhq/kots/kotsadm/pkg/logger"
"github.com/replicatedhq/kots/kotsadm/pkg/persistence"
kotss3 "github.com/replicatedhq/kots/kotsadm/pkg/s3"
)

func waitForDependencies(ctx context.Context) error {
Expand Down
6 changes: 3 additions & 3 deletions kotsadm/pkg/apiserver/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"time"

"github.com/gorilla/mux"
"github.com/replicatedhq/kotsadm/pkg/automation"
"github.com/replicatedhq/kotsadm/pkg/handlers"
"github.com/replicatedhq/kotsadm/pkg/informers"
"github.com/replicatedhq/kots/kotsadm/pkg/automation"
"github.com/replicatedhq/kots/kotsadm/pkg/handlers"
"github.com/replicatedhq/kots/kotsadm/pkg/informers"
)

func Start() {
Expand Down
4 changes: 2 additions & 2 deletions kotsadm/pkg/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/gosimple/slug"
"github.com/pkg/errors"
"github.com/replicatedhq/kotsadm/pkg/logger"
"github.com/replicatedhq/kotsadm/pkg/persistence"
"github.com/replicatedhq/kots/kotsadm/pkg/logger"
"github.com/replicatedhq/kots/kotsadm/pkg/persistence"
"github.com/segmentio/ksuid"
"go.uber.org/zap"
)
Expand Down
8 changes: 4 additions & 4 deletions kotsadm/pkg/automation/automation.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (

"github.com/pkg/errors"
kotspull "github.com/replicatedhq/kots/pkg/pull"
"github.com/replicatedhq/kotsadm/pkg/app"
"github.com/replicatedhq/kotsadm/pkg/kotsutil"
"github.com/replicatedhq/kotsadm/pkg/logger"
"github.com/replicatedhq/kotsadm/pkg/online"
"github.com/replicatedhq/kots/kotsadm/pkg/app"
"github.com/replicatedhq/kots/kotsadm/pkg/kotsutil"
"github.com/replicatedhq/kots/kotsadm/pkg/logger"
"github.com/replicatedhq/kots/kotsadm/pkg/online"
"go.uber.org/zap"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
4 changes: 2 additions & 2 deletions kotsadm/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
kotsconfig "github.com/replicatedhq/kots/pkg/config"
"github.com/replicatedhq/kots/pkg/logger"
"github.com/replicatedhq/kots/pkg/template"
"github.com/replicatedhq/kotsadm/pkg/kotsutil"
"github.com/replicatedhq/kotsadm/pkg/persistence"
"github.com/replicatedhq/kots/kotsadm/pkg/kotsutil"
"github.com/replicatedhq/kots/kotsadm/pkg/persistence"
"k8s.io/client-go/kubernetes/scheme"
)

Expand Down
2 changes: 1 addition & 1 deletion kotsadm/pkg/downstream/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/marccampbell/yaml-toolbox/pkg/splitter"
"github.com/pkg/errors"
"github.com/replicatedhq/kotsadm/pkg/logger"
"github.com/replicatedhq/kots/kotsadm/pkg/logger"
"github.com/sergi/go-diff/diffmatchpatch"
)

Expand Down

0 comments on commit b59904c

Please sign in to comment.