diff --git a/.chglog/config.yaml b/.chglog/config.yaml index d240b2b6a..0030980b3 100755 --- a/.chglog/config.yaml +++ b/.chglog/config.yaml @@ -2,7 +2,7 @@ style: github template: CHANGELOG.tpl.md info: title: CHANGELOG - repository_url: https://github.com/ovrclk/provider-services + repository_url: https://github.com/akash-network/provider options: commits: # filters: diff --git a/.goreleaser-docker-amd64.yaml b/.goreleaser-docker-amd64.yaml index 1da4cfe53..758a83279 100644 --- a/.goreleaser-docker-amd64.yaml +++ b/.goreleaser-docker-amd64.yaml @@ -1,3 +1,4 @@ +project_name: provider env: - GO111MODULE=on - DOCKER_CLI_EXPERIMENTAL="enabled" @@ -31,4 +32,4 @@ dockers: - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }} - --label=org.opencontainers.image.revision={{ .FullCommit }} image_templates: - - 'ghcr.io/ovrclk/{{ .ProjectName }}:latest-amd64' + - 'ghcr.io/akash-network/{{ .ProjectName }}:latest-amd64' diff --git a/.goreleaser-docker-arm64.yaml b/.goreleaser-docker-arm64.yaml index f44beea0d..530ceb63b 100644 --- a/.goreleaser-docker-arm64.yaml +++ b/.goreleaser-docker-arm64.yaml @@ -1,3 +1,4 @@ +project_name: provider env: - GO111MODULE=on - DOCKER_CLI_EXPERIMENTAL="enabled" @@ -31,4 +32,4 @@ dockers: - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }} - --label=org.opencontainers.image.revision={{ .FullCommit }} image_templates: - - 'ghcr.io/ovrclk/{{ .ProjectName }}:latest-arm64' + - 'ghcr.io/akash-network/{{ .ProjectName }}:latest-arm64' diff --git a/.goreleaser.yaml b/.goreleaser.yaml index b880feb75..659e54952 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,3 +1,4 @@ +project_name: provider env: - GO111MODULE=on - DOCKER_CLI_EXPERIMENTAL="enabled" @@ -83,15 +84,15 @@ universal_binaries: - provider-services-darwin-arm64 - provider-services-darwin-amd64 replace: true - name_template: "{{.ProjectName}}" + name_template: "provider-services" archives: - id: provider-services-version builds: - darwin-universal - provider-services-linux-arm64 - provider-services-linux-amd64 - name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}" - wrap_in_directory: true + name_template: "provider-services_{{ .Version }}_{{ .Os }}_{{ .Arch }}" + wrap_in_directory: false format: zip files: - none* @@ -100,8 +101,8 @@ archives: - darwin-universal - provider-services-linux-arm64 - provider-services-linux-amd64 - name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}" - wrap_in_directory: true + name_template: "provider-services_{{ .Os }}_{{ .Arch }}" + wrap_in_directory: false format: zip files: - none* @@ -116,15 +117,15 @@ dockers: - --platform=linux/amd64 - --label=org.opencontainers.image.title={{ .ProjectName }} - --label=org.opencontainers.image.description={{ .ProjectName }} - - --label=org.opencontainers.image.url=https://github.com/ovrclk/provider-services - - --label=org.opencontainers.image.source=https://github.com/ovrclk/provider-services + - --label=org.opencontainers.image.url=https://github.com/akash-network/provider + - --label=org.opencontainers.image.source=https://github.com/akash-network/provider - --label=org.opencontainers.image.version={{ .Version }} - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }} - --label=org.opencontainers.image.revision={{ .FullCommit }} image_templates: - - 'ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }}-amd64' - - 'ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }}-amd64' - - 'ghcr.io/ovrclk/{{ .ProjectName }}:latest-amd64' + - 'ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }}-amd64' + - 'ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }}-amd64' + - 'ghcr.io/akash-network/{{ .ProjectName }}:latest-amd64' - dockerfile: Dockerfile use: buildx goarch: arm64 @@ -134,35 +135,35 @@ dockers: - --platform=linux/arm64 - --label=org.opencontainers.image.title={{ .ProjectName }} - --label=org.opencontainers.image.description={{ .ProjectName }} - - --label=org.opencontainers.image.url=https://github.com/ovrclk/provider-services - - --label=org.opencontainers.image.source=https://github.com/ovrclk/provider-services + - --label=org.opencontainers.image.url=https://github.com/akash-network/provider + - --label=org.opencontainers.image.source=https://github.com/akash-network/provider - --label=org.opencontainers.image.version={{ .Version }} - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }} - --label=org.opencontainers.image.revision={{ .FullCommit }} image_templates: - - 'ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }}-arm64' - - 'ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }}-arm64' - - 'ghcr.io/ovrclk/{{ .ProjectName }}:latest-arm64' + - 'ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }}-arm64' + - 'ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }}-arm64' + - 'ghcr.io/akash-network/{{ .ProjectName }}:latest-arm64' docker_manifests: - - name_template: ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }} + - name_template: ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }} image_templates: - - ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }}-amd64 - - ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }}-arm64 - - name_template: ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }} + - ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }}-amd64 + - ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }}-arm64 + - name_template: ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }} image_templates: - - ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }}-amd64 - - ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }}-arm64 - - name_template: ghcr.io/ovrclk/{{ .ProjectName }}:latest + - ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }}-amd64 + - ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }}-arm64 + - name_template: ghcr.io/akash-network/{{ .ProjectName }}:latest image_templates: - - ghcr.io/ovrclk/{{ .ProjectName }}:latest-amd64 - - ghcr.io/ovrclk/{{ .ProjectName }}:latest-arm64 + - ghcr.io/akash-network/{{ .ProjectName }}:latest-amd64 + - ghcr.io/akash-network/{{ .ProjectName }}:latest-arm64 nfpms: - id: w/version vendor: "Overclock Labs Inc." homepage: "https://ovrclk.com" maintainer: "Overclock Labs Inc. " - file_name_template: "{{ .ConventionalFileName }}" + file_name_template: "provider-services_{{ .Version }}_{{ .Os }}_{{ .Arch }}" formats: - deb - rpm @@ -171,7 +172,7 @@ nfpms: vendor: "Overclock Labs Inc." homepage: "https://ovrclk.com" maintainer: "Overclock Labs Inc. " - file_name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}" + file_name_template: "provider-services_{{ .Os }}_{{ .Arch }}" formats: - deb - rpm @@ -179,8 +180,8 @@ nfpms: release: github: - owner: ovrclk - name: provider-services + owner: akash-network + name: provider prerelease: auto mode: replace draft: false diff --git a/Dockerfile b/Dockerfile index b1897b5fc..4f659a00e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM debian:bullseye -LABEL "org.opencontainers.image.source"="https://github.com/ovrclk/provider-services" +LABEL "org.opencontainers.image.source"="https://github.com/akash-network/provider" COPY provider-services /bin/ diff --git a/Makefile b/Makefile index 1353a6a38..feafdafac 100644 --- a/Makefile +++ b/Makefile @@ -34,17 +34,17 @@ ifeq ($(LEDGER_ENABLED),true) endif GORELEASER_BUILD_VARS := \ --X github.com/ovrclk/provider-services/version.Name=provider-services \ --X github.com/ovrclk/provider-services/version.AppName=provider-services \ --X github.com/ovrclk/provider-services/version.BuildTags=\"$(BUILD_TAGS)\" \ --X github.com/ovrclk/provider-services/version.Version=$(RELEASE_TAG) \ --X github.com/ovrclk/provider-services/version.Commit=$(GIT_HEAD_COMMIT_LONG) - -ldflags = -linkmode=$(GO_LINKMODE) -X github.com/ovrclk/provider-services/version.Name=provider-services \ --X github.com/ovrclk/provider-services/version.AppName=provider-services \ --X github.com/ovrclk/provider-services/version.BuildTags="$(BUILD_TAGS)" \ --X github.com/ovrclk/provider-services/version.Version=$(shell git describe --tags | sed 's/^v//') \ --X github.com/ovrclk/provider-services/version.Commit=$(GIT_HEAD_COMMIT_LONG) +-X github.com/akash-network/provider/version.Name=provider-services \ +-X github.com/akash-network/provider/version.AppName=provider-services \ +-X github.com/akash-network/provider/version.BuildTags=\"$(BUILD_TAGS)\" \ +-X github.com/akash-network/provider/version.Version=$(RELEASE_TAG) \ +-X github.com/akash-network/provider/version.Commit=$(GIT_HEAD_COMMIT_LONG) + +ldflags = -linkmode=$(GO_LINKMODE) -X github.com/akash-network/provider/version.Name=provider-services \ +-X github.com/akash-network/provider/version.AppName=provider-services \ +-X github.com/akash-network/provider/version.BuildTags="$(BUILD_TAGS)" \ +-X github.com/akash-network/provider/version.Version=$(shell git describe --tags | sed 's/^v//') \ +-X github.com/akash-network/provider/version.Commit=$(GIT_HEAD_COMMIT_LONG) # check for nostrip option ifeq (,$(findstring nostrip,$(BUILD_OPTIONS))) diff --git a/README.md b/README.md index 6ab271ad0..831387f25 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # Akash Provider Daemon -[![tests](https://github.com/ovrclk/provider-services/actions/workflows/tests.yaml/badge.svg)](https://github.com/ovrclk/provider-services/actions/workflows/tests.yaml) -[![integration](https://github.com/ovrclk/provider-services/actions/workflows/k8s-integration.yaml/badge.svg)](https://github.com/ovrclk/provider-services/actions/workflows/k8s-integration.yaml) +[![tests](https://github.com/akash-network/provider/actions/workflows/tests.yaml/badge.svg)](https://github.com/akash-network/provider/actions/workflows/tests.yaml) +[![integration](https://github.com/akash-network/provider/actions/workflows/k8s-integration.yaml/badge.svg)](https://github.com/akash-network/provider/actions/workflows/k8s-integration.yaml) This folder contains the Akash Provider Daemon. This piece of software listens to events emitted from the Akash blockchain (code in `../app/app.go`) and takes actions on a connected Kubernetes cluster to provision compute capacity based on the bids that the configured provider key wins. The following are the pieces of the daemon: ## Development environment -[This doc](https://github.com/ovrclk/akash/blob/master/_docs/development-environment.md) guides through setting up local development environment +[This doc](https://github.com/akash-network/node/blob/master/_docs/development-environment.md) guides through setting up local development environment ## Structure diff --git a/_docs/kustomize/akash-node/deployment.yaml b/_docs/kustomize/akash-node/deployment.yaml index e604329e6..977d9157f 100644 --- a/_docs/kustomize/akash-node/deployment.yaml +++ b/_docs/kustomize/akash-node/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: akash-node - image: ghcr.io/ovrclk/akash:stable + image: ghcr.io/akash-network/node:stable imagePullPolicy: IfNotPresent command: [ "/bin/sh" , "/boot/run.sh" ] env: diff --git a/_docs/kustomize/akash-operator-hostname/deployment.yaml b/_docs/kustomize/akash-operator-hostname/deployment.yaml index 8bc436dd5..b029d93b5 100644 --- a/_docs/kustomize/akash-operator-hostname/deployment.yaml +++ b/_docs/kustomize/akash-operator-hostname/deployment.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: akash-operator containers: - name: akash-hostname-operator - image: ghcr.io/ovrclk/provider-services:stable + image: ghcr.io/akash-network/provider:stable imagePullPolicy: IfNotPresent args: ["provider-services", "hostname-operator"] ports: diff --git a/_docs/kustomize/akash-operator-inventory/deployment.yaml b/_docs/kustomize/akash-operator-inventory/deployment.yaml index 061825408..75e9c5e02 100644 --- a/_docs/kustomize/akash-operator-inventory/deployment.yaml +++ b/_docs/kustomize/akash-operator-inventory/deployment.yaml @@ -27,7 +27,7 @@ spec: serviceAccountName: inventory-operator containers: - name: inventory-operator - image: ghcr.io/ovrclk/provider-services + image: ghcr.io/akash-network/provider args: - "provider-services" - "operator" diff --git a/_docs/kustomize/akash-operator-ip/deployment.yaml b/_docs/kustomize/akash-operator-ip/deployment.yaml index 637e7334b..2e0631b92 100644 --- a/_docs/kustomize/akash-operator-ip/deployment.yaml +++ b/_docs/kustomize/akash-operator-ip/deployment.yaml @@ -20,7 +20,7 @@ spec: serviceAccountName: akash-ip-operator containers: - name: akash-ip-operator - image: ghcr.io/ovrclk/provider-services:stable + image: ghcr.io/akash-network/provider:stable imagePullPolicy: IfNotPresent args: ["provider-services", "ip-operator"] ports: diff --git a/_docs/kustomize/akash-provider/deployment.yaml b/_docs/kustomize/akash-provider/deployment.yaml index 483fbfc07..363e99ded 100644 --- a/_docs/kustomize/akash-provider/deployment.yaml +++ b/_docs/kustomize/akash-provider/deployment.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: akash-provider initContainers: - name: import-keys - image: ghcr.io/ovrclk/akash:stable + image: ghcr.io/akash-network/node:stable imagePullPolicy: IfNotPresent command: [ "/bin/sh" , "/boot/run.sh" ] env: @@ -55,7 +55,7 @@ spec: mountPath: /home containers: - name: akash-provider - image: ghcr.io/ovrclk/provider-services:stable + image: ghcr.io/akash-network/provider:stable imagePullPolicy: IfNotPresent args: - provider-services diff --git a/_docs/kustomize/templates/akash-node/docker-image.yaml b/_docs/kustomize/templates/akash-node/docker-image.yaml index 66ef73543..58e517a1f 100644 --- a/_docs/kustomize/templates/akash-node/docker-image.yaml +++ b/_docs/kustomize/templates/akash-node/docker-image.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/template/spec/containers/0/image - value: ghcr.io/ovrclk/akash:stable + value: ghcr.io/akash-network/node:stable diff --git a/_docs/kustomize/templates/akash-operator-hostname/docker-image.yaml b/_docs/kustomize/templates/akash-operator-hostname/docker-image.yaml index 61479efd6..b923f3f44 100644 --- a/_docs/kustomize/templates/akash-operator-hostname/docker-image.yaml +++ b/_docs/kustomize/templates/akash-operator-hostname/docker-image.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/template/spec/containers/0/image - value: ghcr.io/ovrclk/provider-services:latest + value: ghcr.io/akash-network/provider:latest diff --git a/_docs/kustomize/templates/akash-operator-inventory/docker-image.yaml b/_docs/kustomize/templates/akash-operator-inventory/docker-image.yaml index 61479efd6..b923f3f44 100644 --- a/_docs/kustomize/templates/akash-operator-inventory/docker-image.yaml +++ b/_docs/kustomize/templates/akash-operator-inventory/docker-image.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/template/spec/containers/0/image - value: ghcr.io/ovrclk/provider-services:latest + value: ghcr.io/akash-network/provider:latest diff --git a/_docs/kustomize/templates/akash-operator-ip/docker-image.yaml b/_docs/kustomize/templates/akash-operator-ip/docker-image.yaml index 61479efd6..b923f3f44 100644 --- a/_docs/kustomize/templates/akash-operator-ip/docker-image.yaml +++ b/_docs/kustomize/templates/akash-operator-ip/docker-image.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/template/spec/containers/0/image - value: ghcr.io/ovrclk/provider-services:latest + value: ghcr.io/akash-network/provider:latest diff --git a/_docs/kustomize/templates/akash-provider/docker-image.yaml b/_docs/kustomize/templates/akash-provider/docker-image.yaml index 62362f370..8176a3dbe 100644 --- a/_docs/kustomize/templates/akash-provider/docker-image.yaml +++ b/_docs/kustomize/templates/akash-provider/docker-image.yaml @@ -1,6 +1,6 @@ - op: replace path: /spec/template/spec/initContainers/0/image - value: ghcr.io/ovrclk/akash:stable + value: ghcr.io/akash-network/node:stable - op: replace path: /spec/template/spec/containers/0/image - value: ghcr.io/ovrclk/provider-services:stable + value: ghcr.io/akash-network/provider:stable diff --git a/_docs/persistenstorage-provider.md b/_docs/persistenstorage-provider.md index 7ab3f2a05..25884d80b 100644 --- a/_docs/persistenstorage-provider.md +++ b/_docs/persistenstorage-provider.md @@ -14,7 +14,7 @@ Configuration is based on Rook V1.8 Meanwhile examples referenced in the guide can be found [here](TBD) 3. We will prevent cluster from using master nodes. 4. We will be utilizing all available devices on each used node -5. AKASH_ROOT environment variable points to local copy of [akash codebase](https://github.com/ovrclk/akash) +5. AKASH_ROOT environment variable points to local copy of [akash codebase](https://github.com/akash-network/node) ## Configuration @@ -77,7 +77,7 @@ AKASH_BID_PRICE_STORAGE_SCALE=0.0001,default=0.002,beta2=0.002 ``` #### Pricing script -Following [script](https://github.com/ovrclk/akash/blob/master/script/usd_pricing_oracle.sh) can be used for dynamic price changes. +Following [script](https://github.com/akash-network/node/blob/master/script/usd_pricing_oracle.sh) can be used for dynamic price changes. Storage classes are defined on lines 47..51. Comment or remove unsupported storage classes and change scale accordingly. ## Deploying test cluster diff --git a/_docs/provider-k8s-hard-multi-tenancy.md b/_docs/provider-k8s-hard-multi-tenancy.md index 6e92d9488..6813bfe4a 100644 --- a/_docs/provider-k8s-hard-multi-tenancy.md +++ b/_docs/provider-k8s-hard-multi-tenancy.md @@ -13,7 +13,7 @@ There are use cases where running as root might be necessary, and the provider w Restricted PSP source: https://raw.githubusercontent.com/kubernetes/website/master/content/en/examples/policy/restricted-psp.yaml -These polices are applied by the Provider in [provider/cluster/kube/builder.go](https://github.com/ovrclk/akash/blob/master/provider/cluster/kube/builder.go). +These polices are applied by the Provider in [provider/cluster/kube/builder.go](https://github.com/akash-network/node/blob/master/provider/cluster/kube/builder.go). ``` apiVersion: policy/v1beta1 @@ -76,7 +76,7 @@ Networking connections the tenant containers are allowed to create. Ideal goal i Kubernetes Networking Policies enforced by a [CNI Plugin](https://kubernetes.io/docs/tasks/administer-cluster/network-policy-provider/calico-network-policy/)([Calico](https://docs.projectcalico.org/getting-started/kubernetes/) is recommended) -These polices are applied by the Provider in [provider/cluster/kube/builder.go](https://github.com/ovrclk/akash/blob/master/provider/cluster/kube/builder.go). +These polices are applied by the Provider in [provider/cluster/kube/builder.go](https://github.com/akash-network/node/blob/master/provider/cluster/kube/builder.go). ### Ingress Rules * Deny all Ingress into Tenant namespace. This is the base for providing controlled access to the Namespace. @@ -210,4 +210,4 @@ spec: - 10.0.0.0/8 - 192.168.0.0/16 - 172.16.0.0/20 -``` \ No newline at end of file +``` diff --git a/_docs/provider.yaml b/_docs/provider.yaml index f57ec9edd..70eef20d5 100644 --- a/_docs/provider.yaml +++ b/_docs/provider.yaml @@ -2,5 +2,24 @@ host: https://localhost:8443 attributes: - key: region value: us-west + - key: location + value: - key: tier value: 5 + - key: hostname + value: ewr1 +capabilities: + cpu: + - arch: amd64 + vendor: amd + memory: + gpu: + - vendor: nvidia|amd + storage: + - class: default + persistent: true + - class: beta3 + persistent: true + ip-leases: + blocks: + - /29 diff --git a/_docs/pubsub.md b/_docs/pubsub.md index 5a656b2b2..df3af9f06 100644 --- a/_docs/pubsub.md +++ b/_docs/pubsub.md @@ -23,7 +23,7 @@ Redis example below show use of JSON. Protobuf should work as well. | RabbitMQ | **Yes** | **Yes** | **Yes** | N/A | | ActiveMQ | **Yes** | **Yes** | **Yes** | N/A | | Apache Qpid | **No** | **No** | **No** | N/A | -| Redis | **Partial** | **No** | **Yes** | [redis](https://github.com/ovrclk/akash/pull/1623) | +| Redis | **Partial** | **No** | **Yes** | [redis](https://github.com/akash-network/node/pull/1623) | Both **ZeroMQ** and **Qpid** are rather toolkits and requiring significant time to design and implement routing. Consider them as combination of TCP/UDP on steroids. diff --git a/_run/common-kind.mk b/_run/common-kind.mk index 7a4af1596..ad0eddb19 100644 --- a/_run/common-kind.mk +++ b/_run/common-kind.mk @@ -47,8 +47,8 @@ BASH_PATH := $(shell which bash) INGRESS_CONFIG_PATH ?= ../ingress-nginx.yaml CALICO_MANIFEST ?= https://docs.projectcalico.org/v3.8/manifests/calico.yaml -AKASH_DOCKER_IMAGE ?= ghcr.io/ovrclk/akash:latest-$(UNAME_ARCH) -DOCKER_IMAGE ?= ghcr.io/ovrclk/provider-services:latest-$(UNAME_ARCH) +AKASH_DOCKER_IMAGE ?= ghcr.io/akash-network/node:latest-$(UNAME_ARCH) +DOCKER_IMAGE ?= ghcr.io/akash-network/provider:latest-$(UNAME_ARCH) PROVIDER_HOSTNAME ?= localhost PROVIDER_HOST = $(PROVIDER_HOSTNAME):$(KIND_HTTP_PORT) diff --git a/balance_checker.go b/balance_checker.go index f4d8233ba..80019bf57 100644 --- a/balance_checker.go +++ b/balance_checker.go @@ -11,18 +11,18 @@ import ( "github.com/tendermint/tendermint/libs/log" tmrpc "github.com/tendermint/tendermint/rpc/core/types" - "github.com/ovrclk/akash/client" - "github.com/ovrclk/akash/pubsub" - "github.com/ovrclk/akash/util/runner" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - "github.com/ovrclk/akash/x/escrow/client/util" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - - "github.com/ovrclk/provider-services/event" - "github.com/ovrclk/provider-services/session" - - aclient "github.com/ovrclk/akash/client" - netutil "github.com/ovrclk/akash/util/network" + "github.com/akash-network/node/client" + "github.com/akash-network/node/pubsub" + "github.com/akash-network/node/util/runner" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + "github.com/akash-network/node/x/escrow/client/util" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + + "github.com/akash-network/provider/event" + "github.com/akash-network/provider/session" + + aclient "github.com/akash-network/node/client" + netutil "github.com/akash-network/node/util/network" ) type respState int diff --git a/bidengine/config.go b/bidengine/config.go index 893ccdf18..da60ecd09 100644 --- a/bidengine/config.go +++ b/bidengine/config.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - types "github.com/ovrclk/akash/types/v1beta2" + types "github.com/akash-network/node/types/v1beta2" ) type Config struct { diff --git a/bidengine/order.go b/bidengine/order.go index c8e22a12c..61841df7b 100644 --- a/bidengine/order.go +++ b/bidengine/order.go @@ -13,17 +13,17 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/ovrclk/akash/pubsub" - metricsutils "github.com/ovrclk/akash/util/metrics" - "github.com/ovrclk/akash/util/runner" - atypes "github.com/ovrclk/akash/x/audit/types/v1beta2" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - - "github.com/ovrclk/provider-services/cluster" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/event" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/node/pubsub" + metricsutils "github.com/akash-network/node/util/metrics" + "github.com/akash-network/node/util/runner" + atypes "github.com/akash-network/node/x/audit/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + + "github.com/akash-network/provider/cluster" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/event" + "github.com/akash-network/provider/session" ) // order manages bidding and general lifecycle handling of an order. diff --git a/bidengine/order_test.go b/bidengine/order_test.go index 7bd8bfecb..210ce0638 100644 --- a/bidengine/order_test.go +++ b/bidengine/order_test.go @@ -6,31 +6,31 @@ import ( "testing" "time" - "github.com/ovrclk/provider-services/operator/waiter" + "github.com/akash-network/provider/operator/waiter" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/ovrclk/akash/sdkutil" - "github.com/ovrclk/akash/validation/constants" + "github.com/akash-network/node/sdkutil" + "github.com/akash-network/node/validation/constants" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/ovrclk/akash/pubsub" - "github.com/ovrclk/akash/testutil" - atypes "github.com/ovrclk/akash/types/v1beta2" - audittypes "github.com/ovrclk/akash/x/audit/types/v1beta2" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - ptypes "github.com/ovrclk/akash/x/provider/types/v1beta2" + "github.com/akash-network/node/pubsub" + "github.com/akash-network/node/testutil" + atypes "github.com/akash-network/node/types/v1beta2" + audittypes "github.com/akash-network/node/x/audit/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + ptypes "github.com/akash-network/node/x/provider/types/v1beta2" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/provider/session" - broadcastmocks "github.com/ovrclk/akash/client/broadcaster/mocks" - clientmocks "github.com/ovrclk/akash/client/mocks" + broadcastmocks "github.com/akash-network/node/client/broadcaster/mocks" + clientmocks "github.com/akash-network/node/client/mocks" - clustermocks "github.com/ovrclk/provider-services/cluster/mocks" + clustermocks "github.com/akash-network/provider/cluster/mocks" ) type orderTestScaffold struct { diff --git a/bidengine/pricing.go b/bidengine/pricing.go index f4452bed7..a92167c69 100644 --- a/bidengine/pricing.go +++ b/bidengine/pricing.go @@ -11,16 +11,17 @@ import ( "os/exec" "time" - atypes "github.com/ovrclk/akash/types/v1beta2" - - "github.com/ovrclk/provider-services/cluster/util" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/ovrclk/akash/sdl" - "github.com/ovrclk/akash/types/unit" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" "github.com/pkg/errors" "github.com/shopspring/decimal" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/akash-network/node/sdl" + "github.com/akash-network/node/types/unit" + atypes "github.com/akash-network/node/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + + "github.com/akash-network/provider/cluster/util" ) type BidPricingStrategy interface { diff --git a/bidengine/pricing_test.go b/bidengine/pricing_test.go index d5e79f695..094ebb58b 100644 --- a/bidengine/pricing_test.go +++ b/bidengine/pricing_test.go @@ -17,17 +17,17 @@ import ( "testing" "time" - "github.com/ovrclk/provider-services/cluster/util" + "github.com/akash-network/provider/cluster/util" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/shopspring/decimal" "github.com/stretchr/testify/require" - "github.com/ovrclk/akash/sdl" - "github.com/ovrclk/akash/testutil" - "github.com/ovrclk/akash/types/unit" - atypes "github.com/ovrclk/akash/types/v1beta2" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" + "github.com/akash-network/node/sdl" + "github.com/akash-network/node/testutil" + "github.com/akash-network/node/types/unit" + atypes "github.com/akash-network/node/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" ) func Test_ScalePricingRejectsAllZero(t *testing.T) { diff --git a/bidengine/provider_attributes.go b/bidengine/provider_attributes.go index 690e4c5a8..e375cd9db 100644 --- a/bidengine/provider_attributes.go +++ b/bidengine/provider_attributes.go @@ -9,13 +9,13 @@ import ( "github.com/boz/go-lifecycle" - "github.com/ovrclk/akash/pubsub" + "github.com/akash-network/node/pubsub" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/provider/session" - types "github.com/ovrclk/akash/types/v1beta2" - atypes "github.com/ovrclk/akash/x/audit/types/v1beta2" - ptypes "github.com/ovrclk/akash/x/provider/types/v1beta2" + types "github.com/akash-network/node/types/v1beta2" + atypes "github.com/akash-network/node/x/audit/types/v1beta2" + ptypes "github.com/akash-network/node/x/provider/types/v1beta2" ) const ( diff --git a/bidengine/provider_attributes_test.go b/bidengine/provider_attributes_test.go index 3976dd182..4521e4302 100644 --- a/bidengine/provider_attributes_test.go +++ b/bidengine/provider_attributes_test.go @@ -9,15 +9,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - clientmocks "github.com/ovrclk/akash/client/mocks" - "github.com/ovrclk/akash/pubsub" - "github.com/ovrclk/akash/testutil" + clientmocks "github.com/akash-network/node/client/mocks" + "github.com/akash-network/node/pubsub" + "github.com/akash-network/node/testutil" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/provider/session" - akashtypes "github.com/ovrclk/akash/types/v1beta2" - atypes "github.com/ovrclk/akash/x/audit/types/v1beta2" - ptypes "github.com/ovrclk/akash/x/provider/types/v1beta2" + akashtypes "github.com/akash-network/node/types/v1beta2" + atypes "github.com/akash-network/node/x/audit/types/v1beta2" + ptypes "github.com/akash-network/node/x/provider/types/v1beta2" ) type providerAttributesTestScaffold struct { diff --git a/bidengine/service.go b/bidengine/service.go index 13f8975d2..70b02d5bb 100644 --- a/bidengine/service.go +++ b/bidengine/service.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/ovrclk/provider-services/operator/waiter" + "github.com/akash-network/provider/operator/waiter" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -13,12 +13,12 @@ import ( sdkquery "github.com/cosmos/cosmos-sdk/types/query" - "github.com/ovrclk/akash/pubsub" - mquery "github.com/ovrclk/akash/x/market/query" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/pubsub" + mquery "github.com/akash-network/node/x/market/query" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/provider-services/cluster" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/provider/cluster" + "github.com/akash-network/provider/session" ) var ( diff --git a/client/broadcaster/serial.go b/client/broadcaster/serial.go index 78a024662..6eeb14da0 100644 --- a/client/broadcaster/serial.go +++ b/client/broadcaster/serial.go @@ -18,8 +18,8 @@ import ( "github.com/tendermint/tendermint/libs/log" ttypes "github.com/tendermint/tendermint/types" - abroadcaster "github.com/ovrclk/akash/client/broadcaster" - "github.com/ovrclk/akash/sdkutil" + abroadcaster "github.com/akash-network/node/client/broadcaster" + "github.com/akash-network/node/sdkutil" ) const ( diff --git a/cluster/client.go b/cluster/client.go index 56ed5af0b..f33027dd7 100644 --- a/cluster/client.go +++ b/cluster/client.go @@ -9,11 +9,11 @@ import ( "sync" "time" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" - "github.com/ovrclk/akash/sdl" + "github.com/akash-network/node/sdl" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/pkg/errors" @@ -23,17 +23,17 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/version" - manifest "github.com/ovrclk/akash/manifest/v2beta1" + manifest "github.com/akash-network/node/manifest/v2beta1" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" - types "github.com/ovrclk/akash/types/v1beta2" + types "github.com/akash-network/node/types/v1beta2" - "github.com/ovrclk/akash/types/unit" - mquery "github.com/ovrclk/akash/x/market/query" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/types/unit" + mquery "github.com/akash-network/node/x/market/query" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - akashtypes "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + akashtypes "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) var ( diff --git a/cluster/hostname.go b/cluster/hostname.go index 739ea92eb..ec7174c61 100644 --- a/cluster/hostname.go +++ b/cluster/hostname.go @@ -9,9 +9,9 @@ import ( "github.com/boz/go-lifecycle" sdktypes "github.com/cosmos/cosmos-sdk/types" - clustertypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + clustertypes "github.com/akash-network/provider/cluster/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" "github.com/pkg/errors" ) diff --git a/cluster/hostname_test.go b/cluster/hostname_test.go index 7065af85c..f11a54032 100644 --- a/cluster/hostname_test.go +++ b/cluster/hostname_test.go @@ -3,7 +3,7 @@ package cluster import ( "context" "errors" - "github.com/ovrclk/akash/testutil" + "github.com/akash-network/node/testutil" "github.com/stretchr/testify/require" "testing" "time" diff --git a/cluster/inventory.go b/cluster/inventory.go index 88254561d..ff5241236 100644 --- a/cluster/inventory.go +++ b/cluster/inventory.go @@ -17,18 +17,18 @@ import ( "github.com/boz/go-lifecycle" - "github.com/ovrclk/akash/pubsub" - sdlutil "github.com/ovrclk/akash/sdl/util" - atypes "github.com/ovrclk/akash/types/v1beta2" - "github.com/ovrclk/akash/util/runner" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - - "github.com/ovrclk/provider-services/cluster/operatorclients" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/event" - ipoptypes "github.com/ovrclk/provider-services/operator/ipoperator/types" - "github.com/ovrclk/provider-services/operator/waiter" + "github.com/akash-network/node/pubsub" + sdlutil "github.com/akash-network/node/sdl/util" + atypes "github.com/akash-network/node/types/v1beta2" + "github.com/akash-network/node/util/runner" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + + "github.com/akash-network/provider/cluster/operatorclients" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/event" + ipoptypes "github.com/akash-network/provider/operator/ipoperator/types" + "github.com/akash-network/provider/operator/waiter" ) var ( diff --git a/cluster/inventory_test.go b/cluster/inventory_test.go index 6aa9ab90f..602dee887 100644 --- a/cluster/inventory_test.go +++ b/cluster/inventory_test.go @@ -5,26 +5,26 @@ import ( "testing" "time" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - ipoptypes "github.com/ovrclk/provider-services/operator/ipoperator/types" - "github.com/ovrclk/provider-services/operator/waiter" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + ipoptypes "github.com/akash-network/provider/operator/ipoperator/types" + "github.com/akash-network/provider/operator/waiter" - "github.com/ovrclk/provider-services/cluster/operatorclients" + "github.com/akash-network/provider/cluster/operatorclients" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/pubsub" - "github.com/ovrclk/akash/testutil" - "github.com/ovrclk/akash/types/unit" - types "github.com/ovrclk/akash/types/v1beta2" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/pubsub" + "github.com/akash-network/node/testutil" + "github.com/akash-network/node/types/unit" + types "github.com/akash-network/node/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" - "github.com/ovrclk/provider-services/cluster/mocks" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/event" + "github.com/akash-network/provider/cluster/mocks" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/event" ) func newInventory(nodes ...string) ctypes.Inventory { diff --git a/cluster/kube/apply.go b/cluster/kube/apply.go index 11b614f02..7a4f801b8 100644 --- a/cluster/kube/apply.go +++ b/cluster/kube/apply.go @@ -9,11 +9,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - metricsutils "github.com/ovrclk/akash/util/metrics" + metricsutils "github.com/akash-network/node/util/metrics" - crdapi "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" + crdapi "github.com/akash-network/provider/pkg/client/clientset/versioned" - "github.com/ovrclk/provider-services/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/builder" ) func applyNS(ctx context.Context, kc kubernetes.Interface, b builder.NS) error { diff --git a/cluster/kube/builder/builder.go b/cluster/kube/builder/builder.go index c34ba34fb..12d20774a 100644 --- a/cluster/kube/builder/builder.go +++ b/cluster/kube/builder/builder.go @@ -11,10 +11,10 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" - manifesttypes "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifesttypes "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - clusterUtil "github.com/ovrclk/provider-services/cluster/util" + clusterUtil "github.com/akash-network/provider/cluster/util" ) const ( diff --git a/cluster/kube/builder/builder_test.go b/cluster/kube/builder/builder_test.go index 8bca7c076..f7315fa48 100644 --- a/cluster/kube/builder/builder_test.go +++ b/cluster/kube/builder/builder_test.go @@ -8,8 +8,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" - manitypes "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/testutil" + manitypes "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/testutil" ) const testKubeClientNs = "nstest1111" diff --git a/cluster/kube/builder/deployment.go b/cluster/kube/builder/deployment.go index 6ee50b1a8..e2c4d06f4 100644 --- a/cluster/kube/builder/deployment.go +++ b/cluster/kube/builder/deployment.go @@ -6,8 +6,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - manitypes "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manitypes "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type Deployment interface { diff --git a/cluster/kube/builder/deployment_test.go b/cluster/kube/builder/deployment_test.go index 926e9a9e3..978278c3f 100644 --- a/cluster/kube/builder/deployment_test.go +++ b/cluster/kube/builder/deployment_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/ovrclk/akash/sdl" - "github.com/ovrclk/akash/testutil" + "github.com/akash-network/node/sdl" + "github.com/akash-network/node/testutil" "github.com/stretchr/testify/require" ) diff --git a/cluster/kube/builder/manifest.go b/cluster/kube/builder/manifest.go index 2ccd6a99d..67d13dd38 100644 --- a/cluster/kube/builder/manifest.go +++ b/cluster/kube/builder/manifest.go @@ -3,10 +3,10 @@ package builder import ( "github.com/tendermint/tendermint/libs/log" - manitypes "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manitypes "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) type Manifest interface { diff --git a/cluster/kube/builder/namespace.go b/cluster/kube/builder/namespace.go index b9b546aee..730e83885 100644 --- a/cluster/kube/builder/namespace.go +++ b/cluster/kube/builder/namespace.go @@ -4,8 +4,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - manitypes "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manitypes "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type NS interface { diff --git a/cluster/kube/builder/netpol.go b/cluster/kube/builder/netpol.go index 1756e771d..0c9892b56 100644 --- a/cluster/kube/builder/netpol.go +++ b/cluster/kube/builder/netpol.go @@ -8,9 +8,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - manitypes "github.com/ovrclk/akash/manifest/v2beta1" - sdlutil "github.com/ovrclk/akash/sdl/util" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manitypes "github.com/akash-network/node/manifest/v2beta1" + sdlutil "github.com/akash-network/node/sdl/util" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type NetPol interface { diff --git a/cluster/kube/builder/podsecuritypolicy.go b/cluster/kube/builder/podsecuritypolicy.go index e97250f94..69b1a9dfc 100644 --- a/cluster/kube/builder/podsecuritypolicy.go +++ b/cluster/kube/builder/podsecuritypolicy.go @@ -5,8 +5,8 @@ import ( "k8s.io/api/policy/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - manitypes "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manitypes "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type PspRestricted interface { diff --git a/cluster/kube/builder/service.go b/cluster/kube/builder/service.go index b47af9db2..2346cae33 100644 --- a/cluster/kube/builder/service.go +++ b/cluster/kube/builder/service.go @@ -9,9 +9,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - manitypes "github.com/ovrclk/akash/manifest/v2beta1" - sdlutil "github.com/ovrclk/akash/sdl/util" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manitypes "github.com/akash-network/node/manifest/v2beta1" + sdlutil "github.com/akash-network/node/sdl/util" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type Service interface { diff --git a/cluster/kube/builder/settings.go b/cluster/kube/builder/settings.go index 4b655c68d..463201d70 100644 --- a/cluster/kube/builder/settings.go +++ b/cluster/kube/builder/settings.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" - validation_util "github.com/ovrclk/akash/util/validation" + validation_util "github.com/akash-network/node/util/validation" ) // Settings configures k8s object generation such that it is customized to the diff --git a/cluster/kube/builder/statefulset.go b/cluster/kube/builder/statefulset.go index 3587d99db..96edb1a8c 100644 --- a/cluster/kube/builder/statefulset.go +++ b/cluster/kube/builder/statefulset.go @@ -6,8 +6,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - manitypes "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manitypes "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type StatefulSet interface { diff --git a/cluster/kube/builder/workload.go b/cluster/kube/builder/workload.go index fe7317abe..dee15c3fa 100644 --- a/cluster/kube/builder/workload.go +++ b/cluster/kube/builder/workload.go @@ -9,10 +9,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - maniv2beta1 "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/sdl" - sdlutil "github.com/ovrclk/akash/sdl/util" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + maniv2beta1 "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/sdl" + sdlutil "github.com/akash-network/node/sdl/util" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type workloadBase interface { diff --git a/cluster/kube/cleanup.go b/cluster/kube/cleanup.go index 32013bfb5..3cdf3a30a 100644 --- a/cluster/kube/cleanup.go +++ b/cluster/kube/cleanup.go @@ -8,10 +8,10 @@ import ( "k8s.io/apimachinery/pkg/selection" "k8s.io/client-go/kubernetes" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/provider-services/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/builder" ) func cleanupStaleResources(ctx context.Context, kc kubernetes.Interface, lid mtypes.LeaseID, group *manifest.Group) error { diff --git a/cluster/kube/client.go b/cluster/kube/client.go index aa76bfc2c..27f1cd067 100644 --- a/cluster/kube/client.go +++ b/cluster/kube/client.go @@ -19,23 +19,23 @@ import ( metricsclient "k8s.io/metrics/pkg/client/clientset/versioned" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/sdl" - sdlutil "github.com/ovrclk/akash/sdl/util" - metricsutils "github.com/ovrclk/akash/util/metrics" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/sdl" + sdlutil "github.com/akash-network/node/sdl/util" + metricsutils "github.com/akash-network/node/util/metrics" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" restclient "k8s.io/client-go/rest" "k8s.io/client-go/util/flowcontrol" - "github.com/ovrclk/provider-services/cluster" - "github.com/ovrclk/provider-services/cluster/kube/builder" - "github.com/ovrclk/provider-services/cluster/kube/clientcommon" - kubeclienterrors "github.com/ovrclk/provider-services/cluster/kube/errors" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - akashclient "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" + "github.com/akash-network/provider/cluster" + "github.com/akash-network/provider/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/clientcommon" + kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + akashclient "github.com/akash-network/provider/pkg/client/clientset/versioned" ) var ( diff --git a/cluster/kube/client_exec.go b/cluster/kube/client_exec.go index 879cd2c85..94bbf8a12 100644 --- a/cluster/kube/client_exec.go +++ b/cluster/kube/client_exec.go @@ -7,10 +7,10 @@ import ( "sort" "strings" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/provider-services/cluster" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + "github.com/akash-network/provider/cluster" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -21,7 +21,7 @@ import ( "k8s.io/client-go/tools/remotecommand" executil "k8s.io/client-go/util/exec" - "github.com/ovrclk/provider-services/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/builder" ) // the type implementing the interface returned by the Exec command diff --git a/cluster/kube/client_exec_test.go b/cluster/kube/client_exec_test.go index 67fd80283..93eb98b17 100644 --- a/cluster/kube/client_exec_test.go +++ b/cluster/kube/client_exec_test.go @@ -11,19 +11,19 @@ import ( "testing" "time" - "github.com/ovrclk/akash/sdl" - "github.com/ovrclk/akash/testutil" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/sdl" + "github.com/akash-network/node/testutil" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - akashclient_fake "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/fake" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + akashclient_fake "github.com/akash-network/provider/pkg/client/clientset/versioned/fake" - "github.com/ovrclk/provider-services/cluster" - "github.com/ovrclk/provider-services/cluster/kube/builder" + "github.com/akash-network/provider/cluster" + "github.com/akash-network/provider/cluster/kube/builder" kubefake "k8s.io/client-go/kubernetes/fake" ) diff --git a/cluster/kube/client_hostname_connections.go b/cluster/kube/client_hostname_connections.go index 3c468cac6..3b0f30044 100644 --- a/cluster/kube/client_hostname_connections.go +++ b/cluster/kube/client_hostname_connections.go @@ -7,11 +7,11 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" kubeErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/pager" - "github.com/ovrclk/provider-services/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/builder" ) type hostnameResourceEvent struct { diff --git a/cluster/kube/client_ingress.go b/cluster/kube/client_ingress.go index c9fe99efd..c1d5c33b9 100644 --- a/cluster/kube/client_ingress.go +++ b/cluster/kube/client_ingress.go @@ -7,13 +7,13 @@ import ( "strconv" "strings" - "github.com/ovrclk/provider-services/cluster/kube/clientcommon" - kubeclienterrors "github.com/ovrclk/provider-services/cluster/kube/errors" + "github.com/akash-network/provider/cluster/kube/clientcommon" + kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors" - metricsutils "github.com/ovrclk/akash/util/metrics" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + metricsutils "github.com/akash-network/node/util/metrics" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" netv1 "k8s.io/api/networking/v1" kubeErrors "k8s.io/apimachinery/pkg/api/errors" @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/pager" - "github.com/ovrclk/provider-services/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/builder" ) const ( diff --git a/cluster/kube/client_test.go b/cluster/kube/client_test.go index 466213195..b9bb993eb 100644 --- a/cluster/kube/client_test.go +++ b/cluster/kube/client_test.go @@ -6,17 +6,17 @@ import ( "k8s.io/client-go/rest" - kubeclienterrors "github.com/ovrclk/provider-services/cluster/kube/errors" + kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - types "github.com/ovrclk/akash/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + types "github.com/akash-network/node/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" kubeErrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/ovrclk/provider-services/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/builder" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -25,15 +25,15 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/ovrclk/akash/testutil" + "github.com/akash-network/node/testutil" - kubernetes_mocks "github.com/ovrclk/provider-services/testutil/kubernetes_mock" - appsv1_mocks "github.com/ovrclk/provider-services/testutil/kubernetes_mock/typed/apps/v1" - corev1_mocks "github.com/ovrclk/provider-services/testutil/kubernetes_mock/typed/core/v1" + kubernetes_mocks "github.com/akash-network/provider/testutil/kubernetes_mock" + appsv1_mocks "github.com/akash-network/provider/testutil/kubernetes_mock/typed/apps/v1" + corev1_mocks "github.com/akash-network/provider/testutil/kubernetes_mock/typed/core/v1" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - akashclient "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - akashclient_fake "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/fake" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + akashclient "github.com/akash-network/provider/pkg/client/clientset/versioned" + akashclient_fake "github.com/akash-network/provider/pkg/client/clientset/versioned/fake" ) const testKubeClientNs = "nstest1111" diff --git a/cluster/kube/clientcommon/recover_lease_id_from_labels.go b/cluster/kube/clientcommon/recover_lease_id_from_labels.go index f7bab87d8..9b91694d8 100644 --- a/cluster/kube/clientcommon/recover_lease_id_from_labels.go +++ b/cluster/kube/clientcommon/recover_lease_id_from_labels.go @@ -5,9 +5,9 @@ import ( "fmt" "strconv" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/provider-services/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/builder" ) var ( diff --git a/cluster/kube/cluster_ip_connections.go b/cluster/kube/cluster_ip_connections.go index 2ee07b96b..10fd16afb 100644 --- a/cluster/kube/cluster_ip_connections.go +++ b/cluster/kube/cluster_ip_connections.go @@ -5,21 +5,21 @@ import ( "fmt" "strings" + manifest "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" sdktypes "github.com/cosmos/cosmos-sdk/types" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" kubeErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/pager" - akashtypes "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + akashtypes "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" - "github.com/ovrclk/provider-services/cluster/kube/builder" - kubeclienterrors "github.com/ovrclk/provider-services/cluster/kube/errors" - "github.com/ovrclk/provider-services/cluster/types/v1beta2" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + "github.com/akash-network/provider/cluster/kube/builder" + kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors" + "github.com/akash-network/provider/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" ) const ( diff --git a/cluster/kube/deploy_test.go b/cluster/kube/deploy_test.go index 557afda2b..9f0e6370b 100644 --- a/cluster/kube/deploy_test.go +++ b/cluster/kube/deploy_test.go @@ -7,12 +7,12 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/ovrclk/akash/testutil" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/testutil" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/provider-services/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/builder" - "github.com/ovrclk/akash/sdl" + "github.com/akash-network/node/sdl" "github.com/stretchr/testify/require" ) diff --git a/cluster/kube/inventory.go b/cluster/kube/inventory.go index 215389ab7..2aa195a07 100644 --- a/cluster/kube/inventory.go +++ b/cluster/kube/inventory.go @@ -13,14 +13,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/pager" - "github.com/ovrclk/akash/sdl" - types "github.com/ovrclk/akash/types/v1beta2" - metricsutils "github.com/ovrclk/akash/util/metrics" + "github.com/akash-network/node/sdl" + types "github.com/akash-network/node/types/v1beta2" + metricsutils "github.com/akash-network/node/util/metrics" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" - "github.com/ovrclk/provider-services/cluster/kube/builder" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + "github.com/akash-network/provider/cluster/kube/builder" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" ) const ( diff --git a/cluster/kube/inventory_test.go b/cluster/kube/inventory_test.go index 04866b078..8451274ff 100644 --- a/cluster/kube/inventory_test.go +++ b/cluster/kube/inventory_test.go @@ -12,19 +12,19 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/ovrclk/akash/testutil" - "github.com/ovrclk/akash/types/unit" - atypes "github.com/ovrclk/akash/types/v1beta2" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/testutil" + "github.com/akash-network/node/types/unit" + atypes "github.com/akash-network/node/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - kubernetesmocks "github.com/ovrclk/provider-services/testutil/kubernetes_mock" - corev1mocks "github.com/ovrclk/provider-services/testutil/kubernetes_mock/typed/core/v1" - storagev1mocks "github.com/ovrclk/provider-services/testutil/kubernetes_mock/typed/storage/v1" + kubernetesmocks "github.com/akash-network/provider/testutil/kubernetes_mock" + corev1mocks "github.com/akash-network/provider/testutil/kubernetes_mock/typed/core/v1" + storagev1mocks "github.com/akash-network/provider/testutil/kubernetes_mock/typed/storage/v1" - akashclientfake "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/fake" + akashclientfake "github.com/akash-network/provider/pkg/client/clientset/versioned/fake" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" ) type testReservation struct { diff --git a/cluster/kube/k8s_integration_test.go b/cluster/kube/k8s_integration_test.go index 5e0e5f9a4..a51dc31c0 100644 --- a/cluster/kube/k8s_integration_test.go +++ b/cluster/kube/k8s_integration_test.go @@ -16,12 +16,12 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/util/flowcontrol" - atestutil "github.com/ovrclk/akash/testutil" + atestutil "github.com/akash-network/node/testutil" - "github.com/ovrclk/provider-services/cluster/kube/builder" - "github.com/ovrclk/provider-services/cluster/kube/clientcommon" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" - mtestutil "github.com/ovrclk/provider-services/testutil/manifest" + "github.com/akash-network/provider/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/clientcommon" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" + mtestutil "github.com/akash-network/provider/testutil/manifest" ) func TestNewClientNSNotFound(t *testing.T) { diff --git a/cluster/kube/metallb/client.go b/cluster/kube/metallb/client.go index 19039a1b3..26165f8f2 100644 --- a/cluster/kube/metallb/client.go +++ b/cluster/kube/metallb/client.go @@ -12,8 +12,8 @@ import ( "strings" "sync" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" "github.com/prometheus/common/expfmt" "github.com/tendermint/tendermint/libs/log" corev1 "k8s.io/api/core/v1" @@ -25,13 +25,13 @@ import ( "k8s.io/client-go/tools/pager" "k8s.io/client-go/util/flowcontrol" - "github.com/ovrclk/provider-services/cluster/kube/builder" - "github.com/ovrclk/provider-services/cluster/kube/clientcommon" - "github.com/ovrclk/provider-services/cluster/types/v1beta2" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - clusterutil "github.com/ovrclk/provider-services/cluster/util" + "github.com/akash-network/provider/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/clientcommon" + "github.com/akash-network/provider/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + clusterutil "github.com/akash-network/provider/cluster/util" - kubeclienterrors "github.com/ovrclk/provider-services/cluster/kube/errors" + kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors" ) const ( diff --git a/cluster/kube/resourcetypes.go b/cluster/kube/resourcetypes.go index 4380a9796..8e1d316a9 100644 --- a/cluster/kube/resourcetypes.go +++ b/cluster/kube/resourcetypes.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "k8s.io/apimachinery/pkg/api/resource" - types "github.com/ovrclk/akash/types/v1beta2" + types "github.com/akash-network/node/types/v1beta2" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) type resourcePair struct { diff --git a/cluster/kube/resourcetypes_test.go b/cluster/kube/resourcetypes_test.go index 1388a6c7a..b986bb019 100644 --- a/cluster/kube/resourcetypes_test.go +++ b/cluster/kube/resourcetypes_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/api/resource" - types "github.com/ovrclk/akash/types/v1beta2" + types "github.com/akash-network/node/types/v1beta2" ) func TestResourcePairAvailable(t *testing.T) { diff --git a/cluster/manager.go b/cluster/manager.go index 1452ef6fe..acbff3273 100644 --- a/cluster/manager.go +++ b/cluster/manager.go @@ -13,17 +13,17 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/pubsub" - sdlutil "github.com/ovrclk/akash/sdl/util" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - - kubeclienterrors "github.com/ovrclk/provider-services/cluster/kube/errors" - clustertypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/cluster/util" - clusterutil "github.com/ovrclk/provider-services/cluster/util" - "github.com/ovrclk/provider-services/event" - "github.com/ovrclk/provider-services/session" + manifest "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/pubsub" + sdlutil "github.com/akash-network/node/sdl/util" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + + kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors" + clustertypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/cluster/util" + clusterutil "github.com/akash-network/provider/cluster/util" + "github.com/akash-network/provider/event" + "github.com/akash-network/provider/session" "github.com/avast/retry-go" ) diff --git a/cluster/manager_cleanup.go b/cluster/manager_cleanup.go index 01ddcd755..c8884b815 100644 --- a/cluster/manager_cleanup.go +++ b/cluster/manager_cleanup.go @@ -2,8 +2,8 @@ package cluster import ( "context" - "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" logger "github.com/tendermint/tendermint/libs/log" ) diff --git a/cluster/mocks/client.go b/cluster/mocks/client.go index 8360bbede..5675fbb39 100644 --- a/cluster/mocks/client.go +++ b/cluster/mocks/client.go @@ -3,7 +3,7 @@ package mocks import ( - akash_networkv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + akash_networkv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" context "context" @@ -15,11 +15,11 @@ import ( testing "testing" - typesv1beta2 "github.com/ovrclk/akash/x/market/types/v1beta2" + typesv1beta2 "github.com/akash-network/node/x/market/types/v1beta2" - v1beta2 "github.com/ovrclk/provider-services/cluster/types/v1beta2" + v1beta2 "github.com/akash-network/provider/cluster/types/v1beta2" - v2beta1 "github.com/ovrclk/akash/manifest/v2beta1" + v2beta1 "github.com/akash-network/node/manifest/v2beta1" version "k8s.io/apimachinery/pkg/version" ) diff --git a/cluster/mocks/cluster.go b/cluster/mocks/cluster.go index 5b05d9294..39be5c3d2 100644 --- a/cluster/mocks/cluster.go +++ b/cluster/mocks/cluster.go @@ -3,14 +3,14 @@ package mocks import ( - clustertypesv1beta2 "github.com/ovrclk/provider-services/cluster/types/v1beta2" + clustertypesv1beta2 "github.com/akash-network/provider/cluster/types/v1beta2" mock "github.com/stretchr/testify/mock" testing "testing" - typesv1beta2 "github.com/ovrclk/akash/types/v1beta2" + typesv1beta2 "github.com/akash-network/node/types/v1beta2" - v1beta2 "github.com/ovrclk/akash/x/market/types/v1beta2" + v1beta2 "github.com/akash-network/node/x/market/types/v1beta2" ) // Cluster is an autogenerated mock type for the Cluster type diff --git a/cluster/mocks/deployment.go b/cluster/mocks/deployment.go index 58cdab16e..ec5523203 100644 --- a/cluster/mocks/deployment.go +++ b/cluster/mocks/deployment.go @@ -7,9 +7,9 @@ import ( mock "github.com/stretchr/testify/mock" - v1beta2 "github.com/ovrclk/akash/x/market/types/v1beta2" + v1beta2 "github.com/akash-network/node/x/market/types/v1beta2" - v2beta1 "github.com/ovrclk/akash/manifest/v2beta1" + v2beta1 "github.com/akash-network/node/manifest/v2beta1" ) // Deployment is an autogenerated mock type for the Deployment type diff --git a/cluster/mocks/hostname_service_client.go b/cluster/mocks/hostname_service_client.go index ec8b94fd1..f7b8d0538 100644 --- a/cluster/mocks/hostname_service_client.go +++ b/cluster/mocks/hostname_service_client.go @@ -10,7 +10,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" - typesv1beta2 "github.com/ovrclk/akash/x/market/types/v1beta2" + typesv1beta2 "github.com/akash-network/node/x/market/types/v1beta2" ) // HostnameServiceClient is an autogenerated mock type for the HostnameServiceClient type diff --git a/cluster/mocks/ip_operator_client.go b/cluster/mocks/ip_operator_client.go index 8ef40572d..f5dab6b0d 100644 --- a/cluster/mocks/ip_operator_client.go +++ b/cluster/mocks/ip_operator_client.go @@ -9,9 +9,9 @@ import ( testing "testing" - types "github.com/ovrclk/provider-services/operator/ipoperator/types" + types "github.com/akash-network/provider/operator/ipoperator/types" - v1beta2 "github.com/ovrclk/akash/x/market/types/v1beta2" + v1beta2 "github.com/akash-network/node/x/market/types/v1beta2" ) // IPOperatorClient is an autogenerated mock type for the IPOperatorClient type diff --git a/cluster/mocks/metallb_client.go b/cluster/mocks/metallb_client.go index 8de6a8667..d8433c6cf 100644 --- a/cluster/mocks/metallb_client.go +++ b/cluster/mocks/metallb_client.go @@ -9,9 +9,9 @@ import ( testing "testing" - typesv1beta2 "github.com/ovrclk/akash/x/market/types/v1beta2" + typesv1beta2 "github.com/akash-network/node/x/market/types/v1beta2" - v1beta2 "github.com/ovrclk/provider-services/cluster/types/v1beta2" + v1beta2 "github.com/akash-network/provider/cluster/types/v1beta2" ) // MetalLBClient is an autogenerated mock type for the Client type diff --git a/cluster/mocks/read_client.go b/cluster/mocks/read_client.go index 448e0dfa7..ed503a88d 100644 --- a/cluster/mocks/read_client.go +++ b/cluster/mocks/read_client.go @@ -8,11 +8,11 @@ import ( mock "github.com/stretchr/testify/mock" - typesv1beta2 "github.com/ovrclk/akash/x/market/types/v1beta2" + typesv1beta2 "github.com/akash-network/node/x/market/types/v1beta2" - v1beta2 "github.com/ovrclk/provider-services/cluster/types/v1beta2" + v1beta2 "github.com/akash-network/provider/cluster/types/v1beta2" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) // ReadClient is an autogenerated mock type for the ReadClient type diff --git a/cluster/mocks/reservation.go b/cluster/mocks/reservation.go index c2f5b1f2e..8eb627cc6 100644 --- a/cluster/mocks/reservation.go +++ b/cluster/mocks/reservation.go @@ -3,12 +3,12 @@ package mocks import ( - akashtypesv1beta2 "github.com/ovrclk/akash/types/v1beta2" + nodetypesv1beta2 "github.com/akash-network/node/types/v1beta2" mock "github.com/stretchr/testify/mock" testing "testing" - typesv1beta2 "github.com/ovrclk/akash/x/market/types/v1beta2" + typesv1beta2 "github.com/akash-network/node/x/market/types/v1beta2" ) // Reservation is an autogenerated mock type for the Reservation type @@ -45,15 +45,15 @@ func (_m *Reservation) OrderID() typesv1beta2.OrderID { } // Resources provides a mock function with given fields: -func (_m *Reservation) Resources() akashtypesv1beta2.ResourceGroup { +func (_m *Reservation) Resources() nodetypesv1beta2.ResourceGroup { ret := _m.Called() - var r0 akashtypesv1beta2.ResourceGroup - if rf, ok := ret.Get(0).(func() akashtypesv1beta2.ResourceGroup); ok { + var r0 nodetypesv1beta2.ResourceGroup + if rf, ok := ret.Get(0).(func() nodetypesv1beta2.ResourceGroup); ok { r0 = rf() } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(akashtypesv1beta2.ResourceGroup) + r0 = ret.Get(0).(nodetypesv1beta2.ResourceGroup) } } diff --git a/cluster/mocks/service.go b/cluster/mocks/service.go index 9e9579641..00dd05dc0 100644 --- a/cluster/mocks/service.go +++ b/cluster/mocks/service.go @@ -3,21 +3,20 @@ package mocks import ( - akashtypesv1beta2 "github.com/ovrclk/akash/types/v1beta2" - context "context" + nodetypesv1beta2 "github.com/akash-network/node/types/v1beta2" mock "github.com/stretchr/testify/mock" testing "testing" types "github.com/cosmos/cosmos-sdk/types" - typesv1beta2 "github.com/ovrclk/provider-services/cluster/types/v1beta2" + typesv1beta2 "github.com/akash-network/provider/cluster/types/v1beta2" - v1beta2 "github.com/ovrclk/akash/x/market/types/v1beta2" + v1beta2 "github.com/akash-network/node/x/market/types/v1beta2" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) // Service is an autogenerated mock type for the Service type @@ -123,11 +122,11 @@ func (_m *Service) Ready() <-chan struct{} { } // Reserve provides a mock function with given fields: _a0, _a1 -func (_m *Service) Reserve(_a0 v1beta2.OrderID, _a1 akashtypesv1beta2.ResourceGroup) (typesv1beta2.Reservation, error) { +func (_m *Service) Reserve(_a0 v1beta2.OrderID, _a1 nodetypesv1beta2.ResourceGroup) (typesv1beta2.Reservation, error) { ret := _m.Called(_a0, _a1) var r0 typesv1beta2.Reservation - if rf, ok := ret.Get(0).(func(v1beta2.OrderID, akashtypesv1beta2.ResourceGroup) typesv1beta2.Reservation); ok { + if rf, ok := ret.Get(0).(func(v1beta2.OrderID, nodetypesv1beta2.ResourceGroup) typesv1beta2.Reservation); ok { r0 = rf(_a0, _a1) } else { if ret.Get(0) != nil { @@ -136,7 +135,7 @@ func (_m *Service) Reserve(_a0 v1beta2.OrderID, _a1 akashtypesv1beta2.ResourceGr } var r1 error - if rf, ok := ret.Get(1).(func(v1beta2.OrderID, akashtypesv1beta2.ResourceGroup) error); ok { + if rf, ok := ret.Get(1).(func(v1beta2.OrderID, nodetypesv1beta2.ResourceGroup) error); ok { r1 = rf(_a0, _a1) } else { r1 = ret.Error(1) diff --git a/cluster/monitor.go b/cluster/monitor.go index 14f0d9e9d..90bf60e9a 100644 --- a/cluster/monitor.go +++ b/cluster/monitor.go @@ -8,18 +8,18 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/ovrclk/provider-services/cluster/util" + "github.com/akash-network/provider/cluster/util" "github.com/boz/go-lifecycle" "github.com/tendermint/tendermint/libs/log" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/pubsub" - "github.com/ovrclk/akash/util/runner" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/pubsub" + "github.com/akash-network/node/util/runner" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/provider-services/event" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/provider/event" + "github.com/akash-network/provider/session" ) const ( diff --git a/cluster/monitor_test.go b/cluster/monitor_test.go index d0fc96e8a..362a5fda8 100644 --- a/cluster/monitor_test.go +++ b/cluster/monitor_test.go @@ -3,17 +3,17 @@ package cluster import ( "testing" + manifest "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/pubsub" + "github.com/akash-network/node/testutil" "github.com/boz/go-lifecycle" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/pubsub" - "github.com/ovrclk/akash/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/ovrclk/provider-services/cluster/mocks" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/event" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/provider/cluster/mocks" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/event" + "github.com/akash-network/provider/session" ) func TestMonitorInstantiate(t *testing.T) { diff --git a/cluster/operatorclients/hostname_operator_client.go b/cluster/operatorclients/hostname_operator_client.go index a8aee647e..9bb053c5f 100644 --- a/cluster/operatorclients/hostname_operator_client.go +++ b/cluster/operatorclients/hostname_operator_client.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/tendermint/libs/log" "k8s.io/client-go/rest" - clusterutil "github.com/ovrclk/provider-services/cluster/util" + clusterutil "github.com/akash-network/provider/cluster/util" ) const ( diff --git a/cluster/operatorclients/ip_operator_client.go b/cluster/operatorclients/ip_operator_client.go index a8bb91965..8cd33737f 100644 --- a/cluster/operatorclients/ip_operator_client.go +++ b/cluster/operatorclients/ip_operator_client.go @@ -11,13 +11,13 @@ import ( "strings" "sync" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" "github.com/tendermint/tendermint/libs/log" "k8s.io/client-go/rest" - ipoptypes "github.com/ovrclk/provider-services/operator/ipoperator/types" + ipoptypes "github.com/akash-network/provider/operator/ipoperator/types" - clusterutil "github.com/ovrclk/provider-services/cluster/util" + clusterutil "github.com/akash-network/provider/cluster/util" ) var ( diff --git a/cluster/operatorclients/ip_operator_client_test.go b/cluster/operatorclients/ip_operator_client_test.go index 8504ee260..50f8eb7f0 100644 --- a/cluster/operatorclients/ip_operator_client_test.go +++ b/cluster/operatorclients/ip_operator_client_test.go @@ -13,10 +13,13 @@ import ( "testing" "time" - "github.com/cosmos/cosmos-sdk/server" - "github.com/ovrclk/akash/testutil" - ipoptypes "github.com/ovrclk/provider-services/operator/ipoperator/types" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/server" + + "github.com/akash-network/node/testutil" + + ipoptypes "github.com/akash-network/provider/operator/ipoperator/types" ) type fakeIPOperator struct { diff --git a/cluster/reservation.go b/cluster/reservation.go index fba04cf9b..afe6aa00c 100644 --- a/cluster/reservation.go +++ b/cluster/reservation.go @@ -1,12 +1,12 @@ package cluster import ( - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/cluster/util" + "github.com/akash-network/provider/cluster/util" - atypes "github.com/ovrclk/akash/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + atypes "github.com/akash-network/node/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) func newReservation(order mtypes.OrderID, resources atypes.ResourceGroup) *reservation { diff --git a/cluster/resourcetypes_test.go b/cluster/resourcetypes_test.go index 8ce845f00..c8ac47780 100644 --- a/cluster/resourcetypes_test.go +++ b/cluster/resourcetypes_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - types "github.com/ovrclk/akash/types/v1beta2" + types "github.com/akash-network/node/types/v1beta2" ) func TestResourcePairAvailable(t *testing.T) { diff --git a/cluster/service.go b/cluster/service.go index a6f27d736..2a53ca5c9 100644 --- a/cluster/service.go +++ b/cluster/service.go @@ -3,14 +3,14 @@ package cluster import ( "context" - "github.com/ovrclk/provider-services/operator/waiter" + "github.com/akash-network/provider/operator/waiter" - "github.com/ovrclk/provider-services/cluster/operatorclients" + "github.com/akash-network/provider/cluster/operatorclients" "github.com/boz/go-lifecycle" sdktypes "github.com/cosmos/cosmos-sdk/types" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" @@ -18,13 +18,13 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/ovrclk/akash/pubsub" - atypes "github.com/ovrclk/akash/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/pubsub" + atypes "github.com/akash-network/node/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/event" - "github.com/ovrclk/provider-services/session" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/event" + "github.com/akash-network/provider/session" ) // ErrNotRunning is the error when service is not running diff --git a/cluster/types/v1beta1/directives.go b/cluster/types/v1beta1/directives.go index a3e154f0c..ceb831555 100644 --- a/cluster/types/v1beta1/directives.go +++ b/cluster/types/v1beta1/directives.go @@ -1,6 +1,6 @@ package v1beta1 -import mtypes "github.com/ovrclk/akash/x/market/types/v1beta1" +import mtypes "github.com/akash-network/node/x/market/types/v1beta1" type ConnectHostnameToDeploymentDirective struct { Hostname string diff --git a/cluster/types/v1beta1/hostname.go b/cluster/types/v1beta1/hostname.go index f9464ca95..c646e9935 100644 --- a/cluster/types/v1beta1/hostname.go +++ b/cluster/types/v1beta1/hostname.go @@ -1,6 +1,6 @@ package v1beta1 -import mtypes "github.com/ovrclk/akash/x/market/types/v1beta1" +import mtypes "github.com/akash-network/node/x/market/types/v1beta1" type LeaseIDHostnameConnection interface { GetLeaseID() mtypes.LeaseID diff --git a/cluster/types/v1beta1/interfaces.go b/cluster/types/v1beta1/interfaces.go index e06d59609..5aea2fc7a 100644 --- a/cluster/types/v1beta1/interfaces.go +++ b/cluster/types/v1beta1/interfaces.go @@ -5,7 +5,7 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta1" ) type HostnameServiceClient interface { diff --git a/cluster/types/v1beta1/reservation.go b/cluster/types/v1beta1/reservation.go index 427fb6fd4..459f07cc8 100644 --- a/cluster/types/v1beta1/reservation.go +++ b/cluster/types/v1beta1/reservation.go @@ -1,8 +1,8 @@ package v1beta1 import ( - atypes "github.com/ovrclk/akash/types/v1beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta1" + atypes "github.com/akash-network/node/types/v1beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta1" ) // Reservation interface implements orders and resources diff --git a/cluster/types/v1beta1/types.go b/cluster/types/v1beta1/types.go index f3c36e786..a3de1dee4 100644 --- a/cluster/types/v1beta1/types.go +++ b/cluster/types/v1beta1/types.go @@ -7,9 +7,9 @@ import ( eventsv1 "k8s.io/api/events/v1" - manifest "github.com/ovrclk/akash/manifest/v1" - atypes "github.com/ovrclk/akash/types/v1beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta1" + manifest "github.com/akash-network/node/manifest/v1" + atypes "github.com/akash-network/node/types/v1beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta1" ) // Status stores current leases and inventory statuses diff --git a/cluster/types/v1beta2/directives.go b/cluster/types/v1beta2/directives.go index e4c51e4a0..f18b24f5f 100644 --- a/cluster/types/v1beta2/directives.go +++ b/cluster/types/v1beta2/directives.go @@ -1,8 +1,8 @@ package v1beta2 import ( - manifest "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type ConnectHostnameToDeploymentDirective struct { diff --git a/cluster/types/v1beta2/hostname.go b/cluster/types/v1beta2/hostname.go index 8bc70b15b..3fbb7a84c 100644 --- a/cluster/types/v1beta2/hostname.go +++ b/cluster/types/v1beta2/hostname.go @@ -1,7 +1,7 @@ package v1beta2 import ( - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type LeaseIDHostnameConnection interface { diff --git a/cluster/types/v1beta2/interfaces.go b/cluster/types/v1beta2/interfaces.go index bb1e25084..9e43f826f 100644 --- a/cluster/types/v1beta2/interfaces.go +++ b/cluster/types/v1beta2/interfaces.go @@ -5,7 +5,7 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type HostnameServiceClient interface { diff --git a/cluster/types/v1beta2/ip.go b/cluster/types/v1beta2/ip.go index e978fc6af..17844664c 100644 --- a/cluster/types/v1beta2/ip.go +++ b/cluster/types/v1beta2/ip.go @@ -1,8 +1,8 @@ package v1beta2 import ( - manifest "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type IPResourceEvent interface { diff --git a/cluster/types/v1beta2/reservation.go b/cluster/types/v1beta2/reservation.go index a5bd8f910..66a8486c5 100644 --- a/cluster/types/v1beta2/reservation.go +++ b/cluster/types/v1beta2/reservation.go @@ -1,8 +1,8 @@ package v1beta2 import ( - atypes "github.com/ovrclk/akash/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + atypes "github.com/akash-network/node/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) // Reservation interface implements orders and resources diff --git a/cluster/types/v1beta2/types.go b/cluster/types/v1beta2/types.go index b81bb4a43..792147ea2 100644 --- a/cluster/types/v1beta2/types.go +++ b/cluster/types/v1beta2/types.go @@ -10,11 +10,11 @@ import ( eventsv1 "k8s.io/api/events/v1" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - types "github.com/ovrclk/akash/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + types "github.com/akash-network/node/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/akash/sdl" + "github.com/akash-network/node/sdl" ) var ( diff --git a/cluster/util/endpoint_quantity.go b/cluster/util/endpoint_quantity.go index 7e3f61492..aed90d5b2 100644 --- a/cluster/util/endpoint_quantity.go +++ b/cluster/util/endpoint_quantity.go @@ -1,6 +1,6 @@ package util -import atypes "github.com/ovrclk/akash/types/v1beta2" +import atypes "github.com/akash-network/node/types/v1beta2" func GetEndpointQuantityOfResourceGroup(resources atypes.ResourceGroup, kind atypes.Endpoint_Kind) uint { endpoints := make(map[uint32]struct{}) diff --git a/cluster/util/ip_sharing_key.go b/cluster/util/ip_sharing_key.go index 679a3a2d5..5857331f1 100644 --- a/cluster/util/ip_sharing_key.go +++ b/cluster/util/ip_sharing_key.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) var allowedIPEndpointNameRegex = regexp.MustCompile(`^[a-z\d\-]+$`) diff --git a/cluster/util/ip_sharing_key_test.go b/cluster/util/ip_sharing_key_test.go index 21b6767fe..2afcb541f 100644 --- a/cluster/util/ip_sharing_key_test.go +++ b/cluster/util/ip_sharing_key_test.go @@ -3,10 +3,10 @@ package util_test import ( "testing" - "github.com/ovrclk/akash/testutil" + "github.com/akash-network/node/testutil" "github.com/stretchr/testify/require" - "github.com/ovrclk/provider-services/cluster/util" + "github.com/akash-network/provider/cluster/util" ) func TestPassesThroughNames(t *testing.T) { diff --git a/cluster/util/lease_id_to_namespace.go b/cluster/util/lease_id_to_namespace.go index 11255ef2b..9f3659595 100644 --- a/cluster/util/lease_id_to_namespace.go +++ b/cluster/util/lease_id_to_namespace.go @@ -5,7 +5,7 @@ import ( "encoding/base32" "strings" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) // LeaseIDToNamespace generates a unique sha256 sum for identifying a provider's object name. diff --git a/cluster/util/service_discovery_agent.go b/cluster/util/service_discovery_agent.go index dbe00f67f..7f86e053b 100644 --- a/cluster/util/service_discovery_agent.go +++ b/cluster/util/service_discovery_agent.go @@ -4,9 +4,9 @@ import ( "context" "errors" "fmt" + "github.com/akash-network/node/util/runner" "github.com/boz/go-lifecycle" "github.com/desertbit/timer" - "github.com/ovrclk/akash/util/runner" "github.com/tendermint/tendermint/libs/log" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cmd/provider-services/cmd/auth_server.go b/cmd/provider-services/cmd/auth_server.go index 57fb8b831..267ccd821 100644 --- a/cmd/provider-services/cmd/auth_server.go +++ b/cmd/provider-services/cmd/auth_server.go @@ -10,15 +10,15 @@ import ( "golang.org/x/sync/errgroup" + "github.com/akash-network/node/cmd/common" + cmodule "github.com/akash-network/node/x/cert" + cutils "github.com/akash-network/node/x/cert/utils" sdkclient "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/ovrclk/akash/cmd/common" - cmodule "github.com/ovrclk/akash/x/cert" - cutils "github.com/ovrclk/akash/x/cert/utils" "github.com/spf13/cobra" "github.com/spf13/viper" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + gwrest "github.com/akash-network/provider/gateway/rest" ) const ( diff --git a/cmd/provider-services/cmd/clusterns.go b/cmd/provider-services/cmd/clusterns.go index d4f15196d..6411b8326 100644 --- a/cmd/provider-services/cmd/clusterns.go +++ b/cmd/provider-services/cmd/clusterns.go @@ -3,10 +3,10 @@ package cmd import ( "fmt" - mcli "github.com/ovrclk/akash/x/market/client/cli" + mcli "github.com/akash-network/node/x/market/client/cli" "github.com/spf13/cobra" - cutil "github.com/ovrclk/provider-services/cluster/util" + cutil "github.com/akash-network/provider/cluster/util" ) func clusterNSCmd() *cobra.Command { diff --git a/cmd/provider-services/cmd/helpers.go b/cmd/provider-services/cmd/helpers.go index ac9e821de..6f9f9b84d 100644 --- a/cmd/provider-services/cmd/helpers.go +++ b/cmd/provider-services/cmd/helpers.go @@ -13,10 +13,10 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/ovrclk/akash/app" - akashclient "github.com/ovrclk/akash/client" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/app" + akashclient "github.com/akash-network/node/client" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) const ( diff --git a/cmd/provider-services/cmd/leaseEvents.go b/cmd/provider-services/cmd/leaseEvents.go index 4582c2a59..780184217 100644 --- a/cmd/provider-services/cmd/leaseEvents.go +++ b/cmd/provider-services/cmd/leaseEvents.go @@ -8,16 +8,16 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cobra" - cmdcommon "github.com/ovrclk/akash/cmd/common" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + cmdcommon "github.com/akash-network/node/cmd/common" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - cltypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + cltypes "github.com/akash-network/provider/cluster/types/v1beta2" - akashclient "github.com/ovrclk/akash/client" - cutils "github.com/ovrclk/akash/x/cert/utils" + akashclient "github.com/akash-network/node/client" + cutils "github.com/akash-network/node/x/cert/utils" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + gwrest "github.com/akash-network/provider/gateway/rest" ) func leaseEventsCmd() *cobra.Command { diff --git a/cmd/provider-services/cmd/leaseLogs.go b/cmd/provider-services/cmd/leaseLogs.go index 246029345..7af71e509 100644 --- a/cmd/provider-services/cmd/leaseLogs.go +++ b/cmd/provider-services/cmd/leaseLogs.go @@ -10,14 +10,14 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - akashclient "github.com/ovrclk/akash/client" - cmdcommon "github.com/ovrclk/akash/cmd/common" - cutils "github.com/ovrclk/akash/x/cert/utils" + akashclient "github.com/akash-network/node/client" + cmdcommon "github.com/akash-network/node/cmd/common" + cutils "github.com/akash-network/node/x/cert/utils" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + gwrest "github.com/akash-network/provider/gateway/rest" ) func leaseLogsCmd() *cobra.Command { diff --git a/cmd/provider-services/cmd/leaseStatus.go b/cmd/provider-services/cmd/leaseStatus.go index f7634b9f4..bf7306bf6 100644 --- a/cmd/provider-services/cmd/leaseStatus.go +++ b/cmd/provider-services/cmd/leaseStatus.go @@ -6,13 +6,13 @@ import ( sdkclient "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - akashclient "github.com/ovrclk/akash/client" - cmdcommon "github.com/ovrclk/akash/cmd/common" - cutils "github.com/ovrclk/akash/x/cert/utils" - dcli "github.com/ovrclk/akash/x/deployment/client/cli" - mcli "github.com/ovrclk/akash/x/market/client/cli" + akashclient "github.com/akash-network/node/client" + cmdcommon "github.com/akash-network/node/cmd/common" + cutils "github.com/akash-network/node/x/cert/utils" + dcli "github.com/akash-network/node/x/deployment/client/cli" + mcli "github.com/akash-network/node/x/market/client/cli" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + gwrest "github.com/akash-network/provider/gateway/rest" ) func leaseStatusCmd() *cobra.Command { diff --git a/cmd/provider-services/cmd/manifest.go b/cmd/provider-services/cmd/manifest.go index 1b538be7e..8094db6a2 100644 --- a/cmd/provider-services/cmd/manifest.go +++ b/cmd/provider-services/cmd/manifest.go @@ -9,17 +9,17 @@ import ( sdkclient "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" "github.com/pkg/errors" "github.com/spf13/cobra" "gopkg.in/yaml.v3" - akashclient "github.com/ovrclk/akash/client" - "github.com/ovrclk/akash/sdl" - cutils "github.com/ovrclk/akash/x/cert/utils" + akashclient "github.com/akash-network/node/client" + "github.com/akash-network/node/sdl" + cutils "github.com/akash-network/node/x/cert/utils" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + gwrest "github.com/akash-network/provider/gateway/rest" ) var ( diff --git a/cmd/provider-services/cmd/migrate.go b/cmd/provider-services/cmd/migrate.go index 468d80cc0..fdb8a6cf8 100644 --- a/cmd/provider-services/cmd/migrate.go +++ b/cmd/provider-services/cmd/migrate.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - migratecmd "github.com/ovrclk/provider-services/cmd/provider-services/cmd/migrate" + migratecmd "github.com/akash-network/provider/cmd/provider-services/cmd/migrate" ) func migrate() *cobra.Command { diff --git a/cmd/provider-services/cmd/migrate/v0_14tov0_16.go b/cmd/provider-services/cmd/migrate/v0_14tov0_16.go index ce3213e55..f4392d425 100644 --- a/cmd/provider-services/cmd/migrate/v0_14tov0_16.go +++ b/cmd/provider-services/cmd/migrate/v0_14tov0_16.go @@ -21,12 +21,12 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" - "github.com/ovrclk/akash/util/cli" + "github.com/akash-network/node/util/cli" - v1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - v2beta1migrate "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1/migrate" - akashclient "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" + v1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + v2beta1migrate "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1/migrate" + akashclient "github.com/akash-network/provider/pkg/client/clientset/versioned" ) const ( diff --git a/cmd/provider-services/cmd/migrate_endpoints.go b/cmd/provider-services/cmd/migrate_endpoints.go index 8c073b1e9..1b1e2dc03 100644 --- a/cmd/provider-services/cmd/migrate_endpoints.go +++ b/cmd/provider-services/cmd/migrate_endpoints.go @@ -4,12 +4,14 @@ import ( "crypto/tls" "errors" - sdkclient "github.com/cosmos/cosmos-sdk/client" - akashclient "github.com/ovrclk/akash/client" - cutils "github.com/ovrclk/akash/x/cert/utils" "github.com/spf13/cobra" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + sdkclient "github.com/cosmos/cosmos-sdk/client" + + akashclient "github.com/akash-network/node/client" + cutils "github.com/akash-network/node/x/cert/utils" + + gwrest "github.com/akash-network/provider/gateway/rest" ) var errEmptyEndpoints = errors.New("endpoints cannot be empty") diff --git a/cmd/provider-services/cmd/migrate_hostnames.go b/cmd/provider-services/cmd/migrate_hostnames.go index 069c8317e..9b10feb22 100644 --- a/cmd/provider-services/cmd/migrate_hostnames.go +++ b/cmd/provider-services/cmd/migrate_hostnames.go @@ -4,12 +4,14 @@ import ( "crypto/tls" "errors" - sdkclient "github.com/cosmos/cosmos-sdk/client" - akashclient "github.com/ovrclk/akash/client" - cutils "github.com/ovrclk/akash/x/cert/utils" "github.com/spf13/cobra" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + sdkclient "github.com/cosmos/cosmos-sdk/client" + + akashclient "github.com/akash-network/node/client" + cutils "github.com/akash-network/node/x/cert/utils" + + gwrest "github.com/akash-network/provider/gateway/rest" ) var errEmptyHostnames = errors.New("hostnames cannot be empty") diff --git a/cmd/provider-services/cmd/root.go b/cmd/provider-services/cmd/root.go index 2bef2dadf..b7890ef03 100644 --- a/cmd/provider-services/cmd/root.go +++ b/cmd/provider-services/cmd/root.go @@ -1,25 +1,26 @@ package cmd import ( + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/cosmos/cosmos-sdk/client/debug" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/keys" "github.com/cosmos/cosmos-sdk/client/rpc" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - "github.com/ovrclk/akash/app" - "github.com/ovrclk/akash/sdkutil" - "github.com/spf13/cobra" - "github.com/spf13/viper" tmcli "github.com/tendermint/tendermint/libs/cli" - acmd "github.com/ovrclk/akash/cmd/akash/cmd" - ecmd "github.com/ovrclk/akash/events/cmd" + "github.com/akash-network/node/app" + acmd "github.com/akash-network/node/cmd/akash/cmd" + ecmd "github.com/akash-network/node/events/cmd" + "github.com/akash-network/node/sdkutil" - "github.com/ovrclk/provider-services/operator" - "github.com/ovrclk/provider-services/operator/hostnameoperator" - "github.com/ovrclk/provider-services/operator/ipoperator" - "github.com/ovrclk/provider-services/version" + "github.com/akash-network/provider/operator" + "github.com/akash-network/provider/operator/hostnameoperator" + "github.com/akash-network/provider/operator/ipoperator" + "github.com/akash-network/provider/version" ) func NewRootCmd() *cobra.Command { diff --git a/cmd/provider-services/cmd/run.go b/cmd/provider-services/cmd/run.go index 408483543..ebb3bbe73 100644 --- a/cmd/provider-services/cmd/run.go +++ b/cmd/provider-services/cmd/run.go @@ -24,31 +24,31 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/ovrclk/akash/client" - "github.com/ovrclk/akash/cmd/common" - "github.com/ovrclk/akash/events" - "github.com/ovrclk/akash/pubsub" - "github.com/ovrclk/akash/sdl" - cmodule "github.com/ovrclk/akash/x/cert" - ctypes "github.com/ovrclk/akash/x/cert/types/v1beta2" - cutils "github.com/ovrclk/akash/x/cert/utils" - mparams "github.com/ovrclk/akash/x/market/types/v1beta2" - config2 "github.com/ovrclk/akash/x/provider/config" - ptypes "github.com/ovrclk/akash/x/provider/types/v1beta2" - - "github.com/ovrclk/provider-services" - "github.com/ovrclk/provider-services/bidengine" - "github.com/ovrclk/provider-services/client/broadcaster" - "github.com/ovrclk/provider-services/cluster" - "github.com/ovrclk/provider-services/cluster/kube" - "github.com/ovrclk/provider-services/cluster/kube/builder" - "github.com/ovrclk/provider-services/cluster/kube/clientcommon" - "github.com/ovrclk/provider-services/cluster/operatorclients" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" - cmdutil "github.com/ovrclk/provider-services/cmd/provider-services/cmd/util" - gwrest "github.com/ovrclk/provider-services/gateway/rest" - "github.com/ovrclk/provider-services/operator/waiter" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/node/client" + "github.com/akash-network/node/cmd/common" + "github.com/akash-network/node/events" + "github.com/akash-network/node/pubsub" + "github.com/akash-network/node/sdl" + cmodule "github.com/akash-network/node/x/cert" + ctypes "github.com/akash-network/node/x/cert/types/v1beta2" + cutils "github.com/akash-network/node/x/cert/utils" + mparams "github.com/akash-network/node/x/market/types/v1beta2" + config2 "github.com/akash-network/node/x/provider/config" + ptypes "github.com/akash-network/node/x/provider/types/v1beta2" + + "github.com/akash-network/provider" + "github.com/akash-network/provider/bidengine" + "github.com/akash-network/provider/client/broadcaster" + "github.com/akash-network/provider/cluster" + "github.com/akash-network/provider/cluster/kube" + "github.com/akash-network/provider/cluster/kube/builder" + "github.com/akash-network/provider/cluster/kube/clientcommon" + "github.com/akash-network/provider/cluster/operatorclients" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" + cmdutil "github.com/akash-network/provider/cmd/provider-services/cmd/util" + gwrest "github.com/akash-network/provider/gateway/rest" + "github.com/akash-network/provider/operator/waiter" + "github.com/akash-network/provider/session" ) const ( diff --git a/cmd/provider-services/cmd/run_resource_server.go b/cmd/provider-services/cmd/run_resource_server.go index a8bcd1a73..c3da96e6b 100644 --- a/cmd/provider-services/cmd/run_resource_server.go +++ b/cmd/provider-services/cmd/run_resource_server.go @@ -10,15 +10,17 @@ import ( "golang.org/x/sync/errgroup" - sdkclient "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/ovrclk/akash/cmd/common" - cutils "github.com/ovrclk/akash/x/cert/utils" "github.com/spf13/cobra" "github.com/spf13/viper" - cmdutil "github.com/ovrclk/provider-services/cmd/provider-services/cmd/util" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + sdkclient "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + + "github.com/akash-network/node/cmd/common" + cutils "github.com/akash-network/node/x/cert/utils" + + cmdutil "github.com/akash-network/provider/cmd/provider-services/cmd/util" + gwrest "github.com/akash-network/provider/gateway/rest" ) const ( diff --git a/cmd/provider-services/cmd/serviceStatus.go b/cmd/provider-services/cmd/serviceStatus.go index 5b03571c7..4f09e5cfe 100644 --- a/cmd/provider-services/cmd/serviceStatus.go +++ b/cmd/provider-services/cmd/serviceStatus.go @@ -6,13 +6,13 @@ import ( sdkclient "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - akashclient "github.com/ovrclk/akash/client" - cmdcommon "github.com/ovrclk/akash/cmd/common" - cutils "github.com/ovrclk/akash/x/cert/utils" - dcli "github.com/ovrclk/akash/x/deployment/client/cli" - mcli "github.com/ovrclk/akash/x/market/client/cli" + akashclient "github.com/akash-network/node/client" + cmdcommon "github.com/akash-network/node/cmd/common" + cutils "github.com/akash-network/node/x/cert/utils" + dcli "github.com/akash-network/node/x/deployment/client/cli" + mcli "github.com/akash-network/node/x/market/client/cli" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + gwrest "github.com/akash-network/provider/gateway/rest" ) func serviceStatusCmd() *cobra.Command { diff --git a/cmd/provider-services/cmd/shell.go b/cmd/provider-services/cmd/shell.go index d695380ac..c885e036c 100644 --- a/cmd/provider-services/cmd/shell.go +++ b/cmd/provider-services/cmd/shell.go @@ -11,18 +11,20 @@ import ( "sync" "syscall" - sdkclient "github.com/cosmos/cosmos-sdk/client" dockerterm "github.com/moby/term" - akashclient "github.com/ovrclk/akash/client" - cutils "github.com/ovrclk/akash/x/cert/utils" - dcli "github.com/ovrclk/akash/x/deployment/client/cli" - mcli "github.com/ovrclk/akash/x/market/client/cli" "github.com/spf13/cobra" "github.com/spf13/viper" "k8s.io/client-go/tools/remotecommand" "k8s.io/kubectl/pkg/util/term" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + sdkclient "github.com/cosmos/cosmos-sdk/client" + + akashclient "github.com/akash-network/node/client" + cutils "github.com/akash-network/node/x/cert/utils" + dcli "github.com/akash-network/node/x/deployment/client/cli" + mcli "github.com/akash-network/node/x/market/client/cli" + + gwrest "github.com/akash-network/provider/gateway/rest" ) const ( diff --git a/cmd/provider-services/cmd/status.go b/cmd/provider-services/cmd/status.go index 8c9e42a04..e5664ad3c 100644 --- a/cmd/provider-services/cmd/status.go +++ b/cmd/provider-services/cmd/status.go @@ -5,10 +5,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cobra" - akashclient "github.com/ovrclk/akash/client" - cmdcommon "github.com/ovrclk/akash/cmd/common" + akashclient "github.com/akash-network/node/client" + cmdcommon "github.com/akash-network/node/cmd/common" - gwrest "github.com/ovrclk/provider-services/gateway/rest" + gwrest "github.com/akash-network/provider/gateway/rest" ) func statusCmd() *cobra.Command { diff --git a/cmd/provider-services/cmd/test_helpers.go b/cmd/provider-services/cmd/test_helpers.go index a87a0d105..8b8691457 100644 --- a/cmd/provider-services/cmd/test_helpers.go +++ b/cmd/provider-services/cmd/test_helpers.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdktest "github.com/cosmos/cosmos-sdk/testutil" - testutilcli "github.com/ovrclk/akash/testutil/cli" + testutilcli "github.com/akash-network/node/testutil/cli" ) func ProviderLeaseStatusExec(clientCtx client.Context, extraArgs ...string) (sdktest.BufferWriter, error) { diff --git a/cmd/provider-services/main.go b/cmd/provider-services/main.go index 2f03bc743..66254bf16 100644 --- a/cmd/provider-services/main.go +++ b/cmd/provider-services/main.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/server" - acmd "github.com/ovrclk/akash/cmd/akash/cmd" + acmd "github.com/akash-network/node/cmd/akash/cmd" - pcmd "github.com/ovrclk/provider-services/cmd/provider-services/cmd" + pcmd "github.com/akash-network/provider/cmd/provider-services/cmd" ) // In main we call the rootCmd diff --git a/config.go b/config.go index bb7000c17..f0a039750 100644 --- a/config.go +++ b/config.go @@ -5,11 +5,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - types "github.com/ovrclk/akash/types/v1beta2" - "github.com/ovrclk/akash/validation/constants" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + types "github.com/akash-network/node/types/v1beta2" + "github.com/akash-network/node/validation/constants" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/provider-services/bidengine" + "github.com/akash-network/provider/bidengine" ) type Config struct { diff --git a/event/events.go b/event/events.go index 87c652e17..fcb9dfc4b 100644 --- a/event/events.go +++ b/event/events.go @@ -1,11 +1,11 @@ package event import ( + maniv2beta1 "github.com/akash-network/node/manifest/v2beta1" sdk "github.com/cosmos/cosmos-sdk/types" - maniv2beta1 "github.com/ovrclk/akash/manifest/v2beta1" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) // LeaseWon is the data structure that includes leaseID, group and price diff --git a/gateway/rest/client.go b/gateway/rest/client.go index 3066f6e9d..8d17a0f9e 100644 --- a/gateway/rest/client.go +++ b/gateway/rest/client.go @@ -24,16 +24,16 @@ import ( cosmosclient "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - akashclient "github.com/ovrclk/akash/client" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - ctypes "github.com/ovrclk/akash/x/cert/types/v1beta2" - cutils "github.com/ovrclk/akash/x/cert/utils" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - ptypes "github.com/ovrclk/akash/x/provider/types/v1beta2" - - "github.com/ovrclk/provider-services" - cltypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + akashclient "github.com/akash-network/node/client" + manifest "github.com/akash-network/node/manifest/v2beta1" + ctypes "github.com/akash-network/node/x/cert/types/v1beta2" + cutils "github.com/akash-network/node/x/cert/utils" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + ptypes "github.com/akash-network/node/x/provider/types/v1beta2" + + "github.com/akash-network/provider" + cltypes "github.com/akash-network/provider/cluster/types/v1beta2" ) const ( diff --git a/gateway/rest/client_shell.go b/gateway/rest/client_shell.go index 95ed9a9d7..ff80e8b4c 100644 --- a/gateway/rest/client_shell.go +++ b/gateway/rest/client_shell.go @@ -14,8 +14,8 @@ import ( "github.com/gorilla/websocket" "k8s.io/client-go/tools/remotecommand" - "github.com/ovrclk/akash/util/wsutil" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/util/wsutil" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) var ( diff --git a/gateway/rest/integration_test.go b/gateway/rest/integration_test.go index b76da0300..e39e1f0b3 100644 --- a/gateway/rest/integration_test.go +++ b/gateway/rest/integration_test.go @@ -12,21 +12,21 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - qmock "github.com/ovrclk/akash/client/mocks" - akashmanifest "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/testutil" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - providertypes "github.com/ovrclk/akash/x/provider/types/v1beta2" - - "github.com/ovrclk/provider-services" - pcmock "github.com/ovrclk/provider-services/cluster/mocks" - "github.com/ovrclk/provider-services/cluster/operatorclients" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - pmmock "github.com/ovrclk/provider-services/manifest/mocks" - pmock "github.com/ovrclk/provider-services/mocks" - "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - testutilrest "github.com/ovrclk/provider-services/testutil/rest" + qmock "github.com/akash-network/node/client/mocks" + akashmanifest "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/testutil" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + providertypes "github.com/akash-network/node/x/provider/types/v1beta2" + + "github.com/akash-network/provider" + pcmock "github.com/akash-network/provider/cluster/mocks" + "github.com/akash-network/provider/cluster/operatorclients" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + pmmock "github.com/akash-network/provider/manifest/mocks" + pmock "github.com/akash-network/provider/mocks" + "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + testutilrest "github.com/akash-network/provider/testutil/rest" ) func Test_router_Status(t *testing.T) { diff --git a/gateway/rest/middleware.go b/gateway/rest/middleware.go index 044056c5e..fdd7662ca 100644 --- a/gateway/rest/middleware.go +++ b/gateway/rest/middleware.go @@ -15,9 +15,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mquery "github.com/ovrclk/akash/x/market/query" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mquery "github.com/akash-network/node/x/market/query" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type contextKey int diff --git a/gateway/rest/path.go b/gateway/rest/path.go index bb728a837..9751299d5 100644 --- a/gateway/rest/path.go +++ b/gateway/rest/path.go @@ -3,7 +3,7 @@ package rest import ( "fmt" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) const ( diff --git a/gateway/rest/router.go b/gateway/rest/router.go index 5a2076259..4be5dc9b8 100644 --- a/gateway/rest/router.go +++ b/gateway/rest/router.go @@ -27,22 +27,22 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/util/wsutil" - manifestValidation "github.com/ovrclk/akash/validation" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - - "github.com/ovrclk/provider-services" - "github.com/ovrclk/provider-services/cluster" - "github.com/ovrclk/provider-services/cluster/kube/builder" - kubeclienterrors "github.com/ovrclk/provider-services/cluster/kube/errors" - "github.com/ovrclk/provider-services/cluster/operatorclients" - cltypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/cluster/util" - "github.com/ovrclk/provider-services/gateway/utils" - pmanifest "github.com/ovrclk/provider-services/manifest" - ipoptypes "github.com/ovrclk/provider-services/operator/ipoperator/types" + manifest "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/util/wsutil" + manifestValidation "github.com/akash-network/node/validation" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + + "github.com/akash-network/provider" + "github.com/akash-network/provider/cluster" + "github.com/akash-network/provider/cluster/kube/builder" + kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors" + "github.com/akash-network/provider/cluster/operatorclients" + cltypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/cluster/util" + "github.com/akash-network/provider/gateway/utils" + pmanifest "github.com/akash-network/provider/manifest" + ipoptypes "github.com/akash-network/provider/operator/ipoperator/types" ) type CtxAuthKey string diff --git a/gateway/rest/router_migrate.go b/gateway/rest/router_migrate.go index e2815ecb2..872ec6f19 100644 --- a/gateway/rest/router_migrate.go +++ b/gateway/rest/router_migrate.go @@ -9,8 +9,8 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/ovrclk/provider-services/cluster" - clustertypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + "github.com/akash-network/provider/cluster" + clustertypes "github.com/akash-network/provider/cluster/types/v1beta2" ) type migrateRequestBody struct { diff --git a/gateway/rest/router_migrate_endpoint.go b/gateway/rest/router_migrate_endpoint.go index a2d2cd5e2..d60024954 100644 --- a/gateway/rest/router_migrate_endpoint.go +++ b/gateway/rest/router_migrate_endpoint.go @@ -7,11 +7,11 @@ import ( "github.com/tendermint/tendermint/libs/log" - manifest "github.com/ovrclk/akash/manifest/v2beta1" + manifest "github.com/akash-network/node/manifest/v2beta1" - "github.com/ovrclk/provider-services/cluster" - clusterutil "github.com/ovrclk/provider-services/cluster/util" - "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + "github.com/akash-network/provider/cluster" + clusterutil "github.com/akash-network/provider/cluster/util" + "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) type endpointMigrateRequestBody struct { diff --git a/gateway/rest/router_migrate_test.go b/gateway/rest/router_migrate_test.go index 6fc2777cc..d6323135e 100644 --- a/gateway/rest/router_migrate_test.go +++ b/gateway/rest/router_migrate_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/ovrclk/akash/testutil" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/testutil" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) func TestRouteMigrateHostnameDoesNotExist(t *testing.T) { diff --git a/gateway/rest/router_test.go b/gateway/rest/router_test.go index 3ff315f1c..9d7bed171 100644 --- a/gateway/rest/router_test.go +++ b/gateway/rest/router_test.go @@ -19,24 +19,24 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - qmock "github.com/ovrclk/akash/client/mocks" - "github.com/ovrclk/akash/sdl" - "github.com/ovrclk/akash/testutil" - manifestValidation "github.com/ovrclk/akash/validation" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - types "github.com/ovrclk/akash/x/market/types/v1beta2" - - "github.com/ovrclk/provider-services" - kubeclienterrors "github.com/ovrclk/provider-services/cluster/kube/errors" - pcmock "github.com/ovrclk/provider-services/cluster/mocks" - "github.com/ovrclk/provider-services/cluster/operatorclients" - clustertypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/gateway/utils" - pmmock "github.com/ovrclk/provider-services/manifest/mocks" - pmock "github.com/ovrclk/provider-services/mocks" - "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + qmock "github.com/akash-network/node/client/mocks" + "github.com/akash-network/node/sdl" + "github.com/akash-network/node/testutil" + manifestValidation "github.com/akash-network/node/validation" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + types "github.com/akash-network/node/x/market/types/v1beta2" + + "github.com/akash-network/provider" + kubeclienterrors "github.com/akash-network/provider/cluster/kube/errors" + pcmock "github.com/akash-network/provider/cluster/mocks" + "github.com/akash-network/provider/cluster/operatorclients" + clustertypes "github.com/akash-network/provider/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/gateway/utils" + pmmock "github.com/akash-network/provider/manifest/mocks" + pmock "github.com/akash-network/provider/mocks" + "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) const ( diff --git a/gateway/rest/server.go b/gateway/rest/server.go index 047f8453c..cc5b24012 100644 --- a/gateway/rest/server.go +++ b/gateway/rest/server.go @@ -11,11 +11,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - ctypes "github.com/ovrclk/akash/x/cert/types/v1beta2" + ctypes "github.com/akash-network/node/x/cert/types/v1beta2" - "github.com/ovrclk/provider-services" - "github.com/ovrclk/provider-services/cluster/operatorclients" - gwutils "github.com/ovrclk/provider-services/gateway/utils" + "github.com/akash-network/provider" + "github.com/akash-network/provider/cluster/operatorclients" + gwutils "github.com/akash-network/provider/gateway/utils" ) func NewServer( diff --git a/gateway/rest/types.go b/gateway/rest/types.go index 881fda7d3..80ad356e5 100644 --- a/gateway/rest/types.go +++ b/gateway/rest/types.go @@ -1,7 +1,7 @@ package rest import ( - cltypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + cltypes "github.com/akash-network/provider/cluster/types/v1beta2" ) type LeasedIPStatus struct { diff --git a/gateway/utils/utils.go b/gateway/utils/utils.go index c9d0f03e3..cb34a87af 100644 --- a/gateway/utils/utils.go +++ b/gateway/utils/utils.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/pkg/errors" - ctypes "github.com/ovrclk/akash/x/cert/types/v1beta2" + ctypes "github.com/akash-network/node/x/cert/types/v1beta2" ) func NewServerTLSConfig(ctx context.Context, certs []tls.Certificate, cquery ctypes.QueryClient) (*tls.Config, error) { diff --git a/go.mod b/go.mod index 951c2fdf7..96e2cc101 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,9 @@ -module github.com/ovrclk/provider-services +module github.com/akash-network/provider go 1.18 require ( + github.com/akash-network/node v0.21.0-rc4 github.com/avast/retry-go v3.0.0+incompatible github.com/boz/go-lifecycle v0.1.1-0.20190620234137-5139c86739b8 github.com/cosmos/cosmos-sdk v0.45.9 @@ -14,13 +15,11 @@ require ( github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.5.0 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 - github.com/ovrclk/akash v0.20.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.2 github.com/rook/rook v1.9.7 github.com/satori/go.uuid v1.2.0 github.com/shopspring/decimal v1.3.1 - github.com/spf13/cast v1.5.0 // indirect github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.12.0 @@ -172,6 +171,7 @@ require ( github.com/ryanuber/go-glob v1.0.0 // indirect github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/stretchr/objx v0.4.0 // indirect github.com/subosito/gotenv v1.4.0 // indirect diff --git a/go.sum b/go.sum index d65582acc..e8bdde28d 100644 --- a/go.sum +++ b/go.sum @@ -173,6 +173,8 @@ github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= +github.com/akash-network/node v0.21.0-rc4 h1:rvnfAYFw6n6aojB7Il7E8GStJfROwK7HcLVrjZm7hDw= +github.com/akash-network/node v0.21.0-rc4/go.mod h1:oVlRWnpGjmqBCOPTe8xWqkmbGz22+LCv0NmgmswBv/Q= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -1225,8 +1227,6 @@ github.com/ory/dockertest v3.3.4+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnh github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= -github.com/ovrclk/akash v0.20.0 h1:NWxxiDfVfcursDzMPTEVrJ5XII4zS3VZOPMAuZ8qzoQ= -github.com/ovrclk/akash v0.20.0/go.mod h1:fdU2QFRXskOq/030tc26JW19SyfvHsTf4lJXEi9M7HM= github.com/ovrclk/ledger-go v0.14.0 h1:vTonPpIIniEPQBsD3ozxnHZgo394uT/mwve93bBf6Pc= github.com/ovrclk/ledger-go v0.14.0/go.mod h1:/VvYUunOmwkxig4LjNaSfvMSEyVs3UcaMgr78zL96ZA= github.com/ovrclk/ledger-go/cosmos v0.14.0 h1:qSSGP2ysh4yPTowtCODW2lDAUY85AZMzMz+DFIKiavY= diff --git a/godownloader.sh b/godownloader.sh deleted file mode 100755 index 6b5e11449..000000000 --- a/godownloader.sh +++ /dev/null @@ -1,382 +0,0 @@ -#!/bin/sh -set -e - -usage() { - this=$1 - cat </dev/null -} -echoerr() { - echo "$@" 1>&2 -} -log_prefix() { - echo "$0" -} -_logp=6 -log_set_priority() { - _logp="$1" -} -log_priority() { - if test -z "$1"; then - echo "$_logp" - return - fi - [ "$1" -le "$_logp" ] -} -log_tag() { - case $1 in - 0) echo "emerg" ;; - 1) echo "alert" ;; - 2) echo "crit" ;; - 3) echo "err" ;; - 4) echo "warning" ;; - 5) echo "notice" ;; - 6) echo "info" ;; - 7) echo "debug" ;; - *) echo "$1" ;; - esac -} -log_debug() { - log_priority 7 || return 0 - echoerr "$(log_prefix)" "$(log_tag 7)" "$@" -} -log_info() { - log_priority 6 || return 0 - echoerr "$(log_prefix)" "$(log_tag 6)" "$@" -} -log_err() { - log_priority 3 || return 0 - echoerr "$(log_prefix)" "$(log_tag 3)" "$@" -} -log_crit() { - log_priority 2 || return 0 - echoerr "$(log_prefix)" "$(log_tag 2)" "$@" -} -uname_os() { - os=$(uname -s | tr '[:upper:]' '[:lower:]') - case "$os" in - msys_nt) os="windows" ;; - esac - echo "$os" -} -uname_arch() { - arch=$(uname -m) - case $arch in - x86_64) arch="amd64" ;; - x86) arch="386" ;; - i686) arch="386" ;; - i386) arch="386" ;; - aarch64) arch="arm64" ;; - armv5*) arch="armv5" ;; - armv6*) arch="armv6" ;; - armv7*) arch="armv7" ;; - esac - echo ${arch} -} -uname_os_check() { - os=$(uname_os) - case "$os" in - darwin) return 0 ;; - dragonfly) return 0 ;; - freebsd) return 0 ;; - linux) return 0 ;; - android) return 0 ;; - nacl) return 0 ;; - netbsd) return 0 ;; - openbsd) return 0 ;; - plan9) return 0 ;; - solaris) return 0 ;; - windows) return 0 ;; - esac - log_crit "uname_os_check '$(uname -s)' got converted to '$os' which is not a GOOS value. Please file bug at https://github.com/client9/shlib" - return 1 -} -uname_arch_check() { - arch=$(uname_arch) - case "$arch" in - 386) return 0 ;; - amd64) return 0 ;; - arm64) return 0 ;; - armv5) return 0 ;; - armv6) return 0 ;; - armv7) return 0 ;; - ppc64) return 0 ;; - ppc64le) return 0 ;; - mips) return 0 ;; - mipsle) return 0 ;; - mips64) return 0 ;; - mips64le) return 0 ;; - s390x) return 0 ;; - amd64p32) return 0 ;; - esac - log_crit "uname_arch_check '$(uname -m)' got converted to '$arch' which is not a GOARCH value. Please file bug report at https://github.com/client9/shlib" - return 1 -} -untar() { - tarball=$1 - case "${tarball}" in - *.tar.gz | *.tgz) tar -xzf "${tarball}" ;; - *.tar) tar -xf "${tarball}" ;; - *.zip) unzip "${tarball}" ;; - *) - log_err "untar unknown archive format for ${tarball}" - return 1 - ;; - esac -} -http_download_curl() { - local_file=$1 - source_url=$2 - header=$3 - if [ -z "$header" ]; then - code=$(curl -w '%{http_code}' -sL -o "$local_file" "$source_url") - else - code=$(curl -w '%{http_code}' -sL -H "$header" -o "$local_file" "$source_url") - fi - if [ "$code" != "200" ]; then - log_debug "http_download_curl received HTTP status $code" - return 1 - fi - return 0 -} -http_download_wget() { - local_file=$1 - source_url=$2 - header=$3 - if [ -z "$header" ]; then - wget -q -O "$local_file" "$source_url" - else - wget -q --header "$header" -O "$local_file" "$source_url" - fi -} -http_download() { - log_debug "http_download $2" - if is_command curl; then - http_download_curl "$@" - return - elif is_command wget; then - http_download_wget "$@" - return - fi - log_crit "http_download unable to find wget or curl" - return 1 -} -http_copy() { - tmp=$(mktemp) - http_download "${tmp}" "$1" "$2" || return 1 - body=$(cat "$tmp") - rm -f "${tmp}" - echo "$body" -} -github_release() { - owner_repo=$1 - version=$2 - test -z "$version" && version="latest" - giturl="https://github.com/${owner_repo}/releases/${version}" - json=$(http_copy "$giturl" "Accept:application/json") - test -z "$json" && return 1 - version=$(echo "$json" | tr -s '\n' ' ' | sed 's/.*"tag_name":"//' | sed 's/".*//') - test -z "$version" && return 1 - echo "$version" -} -hash_sha256() { - TARGET=${1:-/dev/stdin} - if is_command gsha256sum; then - hash=$(gsha256sum "$TARGET") || return 1 - echo "$hash" | cut -d ' ' -f 1 - elif is_command sha256sum; then - hash=$(sha256sum "$TARGET") || return 1 - echo "$hash" | cut -d ' ' -f 1 - elif is_command shasum; then - hash=$(shasum -a 256 "$TARGET" 2>/dev/null) || return 1 - echo "$hash" | cut -d ' ' -f 1 - elif is_command openssl; then - hash=$(openssl -dst openssl dgst -sha256 "$TARGET") || return 1 - echo "$hash" | cut -d ' ' -f a - else - log_crit "hash_sha256 unable to find command to compute sha-256 hash" - return 1 - fi -} -hash_sha256_verify() { - TARGET=$1 - checksums=$2 - if [ -z "$checksums" ]; then - log_err "hash_sha256_verify checksum file not specified in arg2" - return 1 - fi - BASENAME=${TARGET##*/} - want=$(grep "${BASENAME}" "${checksums}" 2>/dev/null | tr '\t' ' ' | cut -d ' ' -f 1) - if [ -z "$want" ]; then - log_err "hash_sha256_verify unable to find checksum for '${TARGET}' in '${checksums}'" - return 1 - fi - got=$(hash_sha256 "$TARGET") - if [ "$want" != "$got" ]; then - log_err "hash_sha256_verify checksum for '$TARGET' did not verify ${want} vs $got" - return 1 - fi -} -cat /dev/null </dev/null +} +echoerr() { + echo "$@" 1>&2 +} + +#shellcheck disable=SC2317 +log_prefix() { + echo "$0" +} +_logp=6 +log_set_priority() { + _logp="$1" +} +log_priority() { + if test -z "$1"; then + echo "$_logp" + return + fi + [ "$1" -le "$_logp" ] +} +log_tag() { + case $1 in + 0) echo "emerg" ;; + 1) echo "alert" ;; + 2) echo "crit" ;; + 3) echo "err" ;; + 4) echo "warning" ;; + 5) echo "notice" ;; + 6) echo "info" ;; + 7) echo "debug" ;; + *) echo "$1" ;; + esac +} +log_debug() { + log_priority 7 || return 0 + echoerr "$(log_prefix)" "$(log_tag 7)" "$@" +} +log_info() { + log_priority 6 || return 0 + echoerr "$(log_prefix)" "$(log_tag 6)" "$@" +} +log_err() { + log_priority 3 || return 0 + echoerr "$(log_prefix)" "$(log_tag 3)" "$@" +} +log_crit() { + log_priority 2 || return 0 + echoerr "$(log_prefix)" "$(log_tag 2)" "$@" +} +uname_os() { + os=$(uname -s | tr '[:upper:]' '[:lower:]') + case "$os" in + msys_nt) os="windows" ;; + esac + echo "$os" +} +uname_arch() { + arch=$(uname -m) + case $arch in + x86_64) arch="amd64" ;; + x86) arch="386" ;; + i686) arch="386" ;; + i386) arch="386" ;; + aarch64) arch="arm64" ;; + armv5*) arch="armv5" ;; + armv6*) arch="armv6" ;; + armv7*) arch="armv7" ;; + esac + echo "${arch}" +} +uname_os_check() { + os=$(uname_os) + case "$os" in + darwin) return 0 ;; + dragonfly) return 0 ;; + freebsd) return 0 ;; + linux) return 0 ;; + android) return 0 ;; + nacl) return 0 ;; + netbsd) return 0 ;; + openbsd) return 0 ;; + plan9) return 0 ;; + solaris) return 0 ;; + windows) return 0 ;; + esac + log_crit "uname_os_check '$(uname -s)' got converted to '$os' which is not a GOOS value. Please file bug at https://github.com/client9/shlib" + return 1 +} +uname_arch_check() { + arch=$(uname_arch) + case "$arch" in + 386) return 0 ;; + amd64) return 0 ;; + arm64) return 0 ;; + armv5) return 0 ;; + armv6) return 0 ;; + armv7) return 0 ;; + ppc64) return 0 ;; + ppc64le) return 0 ;; + mips) return 0 ;; + mipsle) return 0 ;; + mips64) return 0 ;; + mips64le) return 0 ;; + s390x) return 0 ;; + amd64p32) return 0 ;; + esac + log_crit "uname_arch_check '$(uname -m)' got converted to '$arch' which is not a GOARCH value. Please file bug report at https://github.com/client9/shlib" + return 1 +} +untar() { + tarball=$1 + case "${tarball}" in + *.tar.gz | *.tgz) tar -xzf "${tarball}" ;; + *.tar) tar -xf "${tarball}" ;; + *.zip) unzip "${tarball}" ;; + *) + log_err "untar unknown archive format for ${tarball}" + return 1 + ;; + esac +} +http_download_curl() { + local_file=$1 + source_url=$2 + header=$3 + if [ -z "$header" ]; then + code=$(curl -w '%{http_code}' -sL -o "$local_file" "$source_url") + else + code=$(curl -w '%{http_code}' -sL -H "$header" -o "$local_file" "$source_url") + fi + if [ "$code" != "200" ]; then + log_debug "http_download_curl received HTTP status $code" + return 1 + fi + return 0 +} +http_download_wget() { + local_file=$1 + source_url=$2 + header=$3 + if [ -z "$header" ]; then + wget -q -O "$local_file" "$source_url" + else + wget -q --header "$header" -O "$local_file" "$source_url" + fi +} +http_download() { + log_debug "http_download $2" + if is_command curl; then + http_download_curl "$@" + return + elif is_command wget; then + http_download_wget "$@" + return + fi + log_crit "http_download unable to find wget or curl" + return 1 +} +http_copy() { + tmp=$(mktemp) + http_download "${tmp}" "$1" "$2" || return 1 + body=$(cat "$tmp") + rm -f "${tmp}" + echo "$body" +} +github_release() { + owner_repo=$1 + version=$2 + test -z "$version" && version="latest" + giturl="https://github.com/${owner_repo}/releases/${version}" + json=$(http_copy "$giturl" "Accept:application/json") + test -z "$json" && return 1 + version=$(echo "$json" | tr -s '\n' ' ' | sed 's/.*"tag_name":"//' | sed 's/".*//') + test -z "$version" && return 1 + echo "$version" +} +hash_sha256() { + TARGET=${1:-/dev/stdin} + if is_command gsha256sum; then + hash=$(gsha256sum "$TARGET") || return 1 + echo "$hash" | cut -d ' ' -f 1 + elif is_command sha256sum; then + hash=$(sha256sum "$TARGET") || return 1 + echo "$hash" | cut -d ' ' -f 1 + elif is_command shasum; then + hash=$(shasum -a 256 "$TARGET" 2>/dev/null) || return 1 + echo "$hash" | cut -d ' ' -f 1 + elif is_command openssl; then + hash=$(openssl -dst openssl dgst -sha256 "$TARGET") || return 1 + echo "$hash" | cut -d ' ' -f a + else + log_crit "hash_sha256 unable to find command to compute sha-256 hash" + return 1 + fi +} +hash_sha256_verify() { + TARGET=$1 + checksums=$2 + if [ -z "$checksums" ]; then + log_err "hash_sha256_verify checksum file not specified in arg2" + return 1 + fi + BASENAME=${TARGET##*/} + want=$(grep "${BASENAME}" "${checksums}" 2>/dev/null | tr '\t' ' ' | cut -d ' ' -f 1) + if [ -z "$want" ]; then + log_err "hash_sha256_verify unable to find checksum for '${TARGET}' in '${checksums}'" + return 1 + fi + got=$(hash_sha256 "$TARGET") + if [ "$want" != "$got" ]; then + log_err "hash_sha256_verify checksum for '$TARGET' did not verify ${want} vs $got" + return 1 + fi +} +cat /dev/null </dev/null) -AKASH_SRC_IS_LOCAL := $(shell $(ROOT_DIR)/script/is_local_gomod.sh "github.com/ovrclk/akash") -AKASH_LOCAL_PATH := $(shell $(GO) list -mod=readonly -m -f '{{ .Replace }}' "github.com/ovrclk/akash") -AKASH_VERSION := $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/ovrclk/akash | cut -c2-) +AKASH_SRC_IS_LOCAL := $(shell $(ROOT_DIR)/script/is_local_gomod.sh "github.com/akash-network/node") +AKASH_LOCAL_PATH := $(shell $(GO) list -mod=readonly -m -f '{{ .Replace }}' "github.com/akash-network/node") +AKASH_VERSION := $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/akash-network/node | cut -c2-) GRPC_GATEWAY_VERSION := $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/grpc-ecosystem/grpc-gateway) GOLANGCI_LINT_VERSION ?= v1.50.0 GOLANG_VERSION ?= 1.16.1 diff --git a/make/setup-cache.mk b/make/setup-cache.mk index 6908695e7..96aa93e3c 100644 --- a/make/setup-cache.mk +++ b/make/setup-cache.mk @@ -29,13 +29,13 @@ endif ifeq ($(AKASH_SRC_IS_LOCAL), true) akash: @echo "compiling and installing Akash from local sources" - make -C $(AKASH_LOCAL_PATH) akash AKASH=$(AP_DEVCACHE_BIN)/akash + make -C $(AKASH_LOCAL_PATH) akash AKASH=$(AP_DEVCACHE_BIN)/node else $(AKASH_VERSION_FILE): $(AP_DEVCACHE) @echo "Installing akash $(AKASH_VERSION) ..." rm -f $(AKASH) - wget -q https://github.com/ovrclk/akash/releases/download/v$(AKASH_VERSION)/akash_$(UNAME_OS_LOWER)_$(AKASH_INSTALL_ARCH).zip -O $(AP_DEVCACHE)/akash.zip - unzip -p $(AP_DEVCACHE)/akash.zip akash_$(UNAME_OS_LOWER)_$(AKASH_INSTALL_ARCH)/akash > $(AKASH) + wget -q https://github.com/akash-network/node/releases/download/v$(AKASH_VERSION)/akash_$(UNAME_OS_LOWER)_$(AKASH_INSTALL_ARCH).zip -O $(AP_DEVCACHE)/akash.zip + unzip -p $(AP_DEVCACHE)/akash.zip akash > $(AKASH) chmod +x $(AKASH) rm $(AP_DEVCACHE)/akash.zip rm -rf "$(dir $@)" diff --git a/manifest/manager.go b/manifest/manager.go index 5ac77e286..47523544b 100644 --- a/manifest/manager.go +++ b/manifest/manager.go @@ -8,21 +8,22 @@ import ( "time" "github.com/boz/go-lifecycle" - "github.com/ovrclk/akash/sdl" - "github.com/ovrclk/akash/validation" "github.com/pkg/errors" - "github.com/tendermint/tendermint/libs/log" - maniv2beta1 "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/pubsub" - sdlutil "github.com/ovrclk/akash/sdl/util" - "github.com/ovrclk/akash/util/runner" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/tendermint/tendermint/libs/log" - clustertypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/event" - "github.com/ovrclk/provider-services/session" + maniv2beta1 "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/pubsub" + "github.com/akash-network/node/sdl" + sdlutil "github.com/akash-network/node/sdl/util" + "github.com/akash-network/node/util/runner" + "github.com/akash-network/node/validation" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + + clustertypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/event" + "github.com/akash-network/provider/session" ) const ( diff --git a/manifest/manager_test.go b/manifest/manager_test.go index fd916b792..32632e7d6 100644 --- a/manifest/manager_test.go +++ b/manifest/manager_test.go @@ -5,30 +5,30 @@ import ( "testing" "time" - sdlutil "github.com/ovrclk/akash/sdl/util" - escrowtypes "github.com/ovrclk/akash/x/escrow/types/v1beta2" + sdlutil "github.com/akash-network/node/sdl/util" + escrowtypes "github.com/akash-network/node/x/escrow/types/v1beta2" - clustertypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + clustertypes "github.com/akash-network/provider/cluster/types/v1beta2" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - clientMocks "github.com/ovrclk/akash/client/mocks" - "github.com/ovrclk/akash/pubsub" - "github.com/ovrclk/akash/sdkutil" - "github.com/ovrclk/akash/testutil" + clientMocks "github.com/akash-network/node/client/mocks" + "github.com/akash-network/node/pubsub" + "github.com/akash-network/node/sdkutil" + "github.com/akash-network/node/testutil" - "github.com/ovrclk/akash/sdl" + "github.com/akash-network/node/sdl" - "github.com/ovrclk/provider-services/cluster" - "github.com/ovrclk/provider-services/event" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/provider/cluster" + "github.com/akash-network/provider/event" + "github.com/akash-network/provider/session" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - types "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" - ptypes "github.com/ovrclk/akash/x/provider/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + types "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + ptypes "github.com/akash-network/node/x/provider/types/v1beta2" ) type scaffold struct { diff --git a/manifest/mocks/client.go b/manifest/mocks/client.go index 3541de5ad..484a14ed0 100644 --- a/manifest/mocks/client.go +++ b/manifest/mocks/client.go @@ -9,9 +9,9 @@ import ( testing "testing" - v1beta2 "github.com/ovrclk/akash/x/deployment/types/v1beta2" + v1beta2 "github.com/akash-network/node/x/deployment/types/v1beta2" - v2beta1 "github.com/ovrclk/akash/manifest/v2beta1" + v2beta1 "github.com/akash-network/node/manifest/v2beta1" ) // Client is an autogenerated mock type for the Client type diff --git a/manifest/mocks/status_client.go b/manifest/mocks/status_client.go index f4664c55f..cad9f9826 100644 --- a/manifest/mocks/status_client.go +++ b/manifest/mocks/status_client.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - manifest "github.com/ovrclk/provider-services/manifest" + manifest "github.com/akash-network/provider/manifest" mock "github.com/stretchr/testify/mock" testing "testing" diff --git a/manifest/service.go b/manifest/service.go index 0fd2bd431..0e6ddf986 100644 --- a/manifest/service.go +++ b/manifest/service.go @@ -5,22 +5,22 @@ import ( "errors" "time" - clustertypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + clustertypes "github.com/akash-network/provider/cluster/types/v1beta2" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/boz/go-lifecycle" - manifest "github.com/ovrclk/akash/manifest/v2beta1" + manifest "github.com/akash-network/node/manifest/v2beta1" - "github.com/ovrclk/akash/pubsub" - dquery "github.com/ovrclk/akash/x/deployment/query" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/pubsub" + dquery "github.com/akash-network/node/x/deployment/query" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/provider-services/event" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/provider/event" + "github.com/akash-network/provider/session" ) // ErrNotRunning is the error when service is not running diff --git a/manifest/types.go b/manifest/types.go index b3b5480bf..d605ad207 100644 --- a/manifest/types.go +++ b/manifest/types.go @@ -1,9 +1,9 @@ package manifest import ( - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" - maniv2beta1 "github.com/ovrclk/akash/manifest/v2beta1" + maniv2beta1 "github.com/akash-network/node/manifest/v2beta1" ) // Status is the data structure diff --git a/manifest/watchdog.go b/manifest/watchdog.go index 397e5482d..d1dc4b4b3 100644 --- a/manifest/watchdog.go +++ b/manifest/watchdog.go @@ -5,12 +5,14 @@ import ( "time" "github.com/boz/go-lifecycle" - "github.com/ovrclk/akash/util/runner" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - types "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/tendermint/tendermint/libs/log" - "github.com/ovrclk/provider-services/session" + "github.com/akash-network/node/util/runner" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + types "github.com/akash-network/node/x/market/types/v1beta2" + + "github.com/akash-network/provider/session" ) type watchdog struct { diff --git a/manifest/watchdog_test.go b/manifest/watchdog_test.go index 249f2f8ca..924241a35 100644 --- a/manifest/watchdog_test.go +++ b/manifest/watchdog_test.go @@ -4,17 +4,19 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" - broadcastmocks "github.com/ovrclk/akash/client/broadcaster/mocks" - clientmocks "github.com/ovrclk/akash/client/mocks" - "github.com/ovrclk/akash/testutil" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" - types "github.com/ovrclk/akash/x/market/types/v1beta2" - ptypes "github.com/ovrclk/akash/x/provider/types/v1beta2" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/ovrclk/provider-services/session" + sdk "github.com/cosmos/cosmos-sdk/types" + + broadcastmocks "github.com/akash-network/node/client/broadcaster/mocks" + clientmocks "github.com/akash-network/node/client/mocks" + "github.com/akash-network/node/testutil" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + types "github.com/akash-network/node/x/market/types/v1beta2" + ptypes "github.com/akash-network/node/x/provider/types/v1beta2" + + "github.com/akash-network/provider/session" ) type watchdogTestScaffold struct { diff --git a/mocks/client.go b/mocks/client.go index ea8e9b93c..2ebee40ac 100644 --- a/mocks/client.go +++ b/mocks/client.go @@ -5,19 +5,19 @@ package mocks import ( context "context" - cluster "github.com/ovrclk/provider-services/cluster" + cluster "github.com/akash-network/provider/cluster" - manifest "github.com/ovrclk/provider-services/manifest" + manifest "github.com/akash-network/provider/manifest" mock "github.com/stretchr/testify/mock" - provider "github.com/ovrclk/provider-services" + provider "github.com/akash-network/provider" testing "testing" - typesv1beta2 "github.com/ovrclk/akash/x/deployment/types/v1beta2" + typesv1beta2 "github.com/akash-network/node/x/deployment/types/v1beta2" - v1beta2 "github.com/ovrclk/provider-services/cluster/types/v1beta2" + v1beta2 "github.com/akash-network/provider/cluster/types/v1beta2" ) // Client is an autogenerated mock type for the Client type diff --git a/mocks/status_client.go b/mocks/status_client.go index 372187371..1515b8813 100644 --- a/mocks/status_client.go +++ b/mocks/status_client.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - provider "github.com/ovrclk/provider-services" + provider "github.com/akash-network/provider" mock "github.com/stretchr/testify/mock" testing "testing" diff --git a/operator/cmd.go b/operator/cmd.go index 2ef4b69c1..31a9228d7 100644 --- a/operator/cmd.go +++ b/operator/cmd.go @@ -3,7 +3,7 @@ package operator import ( "github.com/spf13/cobra" - "github.com/ovrclk/provider-services/operator/inventory" + "github.com/akash-network/provider/operator/inventory" ) func Cmd() *cobra.Command { diff --git a/operator/hostnameoperator/hostname_operator.go b/operator/hostnameoperator/hostname_operator.go index 0ff4ff01c..bb76eb779 100644 --- a/operator/hostnameoperator/hostname_operator.go +++ b/operator/hostnameoperator/hostname_operator.go @@ -10,9 +10,9 @@ import ( "strings" "time" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - sdlutil "github.com/ovrclk/akash/sdl/util" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + sdlutil "github.com/akash-network/node/sdl/util" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -20,13 +20,13 @@ import ( "golang.org/x/sync/errgroup" kubeErrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/ovrclk/provider-services/cluster" - clusterClient "github.com/ovrclk/provider-services/cluster/kube" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - clusterutil "github.com/ovrclk/provider-services/cluster/util" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" - "github.com/ovrclk/provider-services/operator/operatorcommon" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + "github.com/akash-network/provider/cluster" + clusterClient "github.com/akash-network/provider/cluster/kube" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + clusterutil "github.com/akash-network/provider/cluster/util" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" + "github.com/akash-network/provider/operator/operatorcommon" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) var ( diff --git a/operator/hostnameoperator/hostname_operator_test.go b/operator/hostnameoperator/hostname_operator_test.go index ed14bf414..941113569 100644 --- a/operator/hostnameoperator/hostname_operator_test.go +++ b/operator/hostnameoperator/hostname_operator_test.go @@ -9,16 +9,16 @@ import ( "testing" "time" - "github.com/ovrclk/akash/testutil" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/testutil" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" - "github.com/ovrclk/provider-services/cluster/mocks" - cluster "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/operator/operatorcommon" + "github.com/akash-network/provider/cluster/mocks" + cluster "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/operator/operatorcommon" ) type testHostnameResourceEv struct { diff --git a/operator/hostnameoperator/hostname_operator_types.go b/operator/hostnameoperator/hostname_operator_types.go index 059d4c70a..b8adb27e2 100644 --- a/operator/hostnameoperator/hostname_operator_types.go +++ b/operator/hostnameoperator/hostname_operator_types.go @@ -3,9 +3,9 @@ package hostnameoperator import ( "time" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" ) type managedHostname struct { diff --git a/operator/inventory/ceph.go b/operator/inventory/ceph.go index 622f9d378..c6742b48f 100644 --- a/operator/inventory/ceph.go +++ b/operator/inventory/ceph.go @@ -17,9 +17,9 @@ import ( storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/watch" - "github.com/ovrclk/akash/util/runner" + "github.com/akash-network/node/util/runner" - akashv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + akashv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) const ( diff --git a/operator/inventory/cmd.go b/operator/inventory/cmd.go index ab6cd67a3..c3388db84 100644 --- a/operator/inventory/cmd.go +++ b/operator/inventory/cmd.go @@ -10,11 +10,11 @@ import ( "sync" "time" + "github.com/akash-network/node/util/runner" "github.com/cskr/pubsub" "github.com/go-logr/logr" "github.com/go-logr/zapr" "github.com/gorilla/mux" - "github.com/ovrclk/akash/util/runner" rookclientset "github.com/rook/rook/pkg/client/clientset/versioned" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -25,12 +25,11 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" - cmdutil "github.com/ovrclk/provider-services/cmd/provider-services/cmd/util" - - "github.com/ovrclk/provider-services/cluster/kube/clientcommon" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" - akashv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - akashclientset "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" + "github.com/akash-network/provider/cluster/kube/clientcommon" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" + cmdutil "github.com/akash-network/provider/cmd/provider-services/cmd/util" + akashv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + akashclientset "github.com/akash-network/provider/pkg/client/clientset/versioned" ) func CmdSetContextValue(cmd *cobra.Command, key, val interface{}) { diff --git a/operator/inventory/rancher.go b/operator/inventory/rancher.go index 455f63652..1b3fa52b0 100644 --- a/operator/inventory/rancher.go +++ b/operator/inventory/rancher.go @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - akashv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + akashv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) type rancher struct { diff --git a/operator/inventory/types.go b/operator/inventory/types.go index eadf09400..889764e05 100644 --- a/operator/inventory/types.go +++ b/operator/inventory/types.go @@ -13,8 +13,8 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" - akashv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" + akashv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) const ( diff --git a/operator/inventory/util.go b/operator/inventory/util.go index 25e23da37..b5fb0d56e 100644 --- a/operator/inventory/util.go +++ b/operator/inventory/util.go @@ -13,7 +13,7 @@ import ( rookclientset "github.com/rook/rook/pkg/client/clientset/versioned" - akashclientset "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" + akashclientset "github.com/akash-network/provider/pkg/client/clientset/versioned" ) func LogFromCtx(ctx context.Context) logr.Logger { diff --git a/operator/ipoperator/ip_operator.go b/operator/ipoperator/ip_operator.go index e948f0eb4..7c3df109f 100644 --- a/operator/ipoperator/ip_operator.go +++ b/operator/ipoperator/ip_operator.go @@ -12,25 +12,27 @@ import ( "sync" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gorilla/mux" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/tendermint/libs/log" "golang.org/x/sync/errgroup" - kubeErrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/ovrclk/provider-services/cluster" - clusterClient "github.com/ovrclk/provider-services/cluster/kube" - "github.com/ovrclk/provider-services/cluster/kube/metallb" - "github.com/ovrclk/provider-services/cluster/types/v1beta2" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - clusterutil "github.com/ovrclk/provider-services/cluster/util" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/tendermint/tendermint/libs/log" + + kubeErrors "k8s.io/apimachinery/pkg/api/errors" - ipoptypes "github.com/ovrclk/provider-services/operator/ipoperator/types" - "github.com/ovrclk/provider-services/operator/operatorcommon" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" + + "github.com/akash-network/provider/cluster" + clusterClient "github.com/akash-network/provider/cluster/kube" + "github.com/akash-network/provider/cluster/kube/metallb" + "github.com/akash-network/provider/cluster/types/v1beta2" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + clusterutil "github.com/akash-network/provider/cluster/util" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" + ipoptypes "github.com/akash-network/provider/operator/ipoperator/types" + "github.com/akash-network/provider/operator/operatorcommon" ) const ( diff --git a/operator/ipoperator/ip_operator_cmd.go b/operator/ipoperator/ip_operator_cmd.go index d87b98234..60a328ca6 100644 --- a/operator/ipoperator/ip_operator_cmd.go +++ b/operator/ipoperator/ip_operator_cmd.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" - "github.com/ovrclk/provider-services/operator/operatorcommon" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" + "github.com/akash-network/provider/operator/operatorcommon" ) const ( diff --git a/operator/ipoperator/ip_operator_test.go b/operator/ipoperator/ip_operator_test.go index 74320c430..5aff9c64b 100644 --- a/operator/ipoperator/ip_operator_test.go +++ b/operator/ipoperator/ip_operator_test.go @@ -5,17 +5,17 @@ import ( "testing" "time" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - "github.com/ovrclk/akash/testutil" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + "github.com/akash-network/node/testutil" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" kubeErrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/ovrclk/provider-services/cluster/mocks" - "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/operator/operatorcommon" + "github.com/akash-network/provider/cluster/mocks" + "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/operator/operatorcommon" ) type ipOperatorScaffold struct { diff --git a/operator/ipoperator/ip_operator_types.go b/operator/ipoperator/ip_operator_types.go index fe6446915..a5d83e244 100644 --- a/operator/ipoperator/ip_operator_types.go +++ b/operator/ipoperator/ip_operator_types.go @@ -5,10 +5,10 @@ import ( "sync/atomic" "time" - "github.com/ovrclk/akash/manifest/v2beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + "github.com/akash-network/node/manifest/v2beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - "github.com/ovrclk/provider-services/cluster/types/v1beta2" + "github.com/akash-network/provider/cluster/types/v1beta2" ) /* diff --git a/operator/ipoperator/types/delete_reservation_request.go b/operator/ipoperator/types/delete_reservation_request.go index 7f2f9f9f7..8c0efa0e0 100644 --- a/operator/ipoperator/types/delete_reservation_request.go +++ b/operator/ipoperator/types/delete_reservation_request.go @@ -1,7 +1,7 @@ package types import ( - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" ) type IPReservationDelete struct { diff --git a/operator/ipoperator/types/reservation_request.go b/operator/ipoperator/types/reservation_request.go index 16470a24e..17e51c838 100644 --- a/operator/ipoperator/types/reservation_request.go +++ b/operator/ipoperator/types/reservation_request.go @@ -1,6 +1,6 @@ package types -import mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" +import mtypes "github.com/akash-network/node/x/market/types/v1beta2" type IPReservationRequest struct { OrderID mtypes.OrderID diff --git a/operator/operatorcommon/ignore_list.go b/operator/operatorcommon/ignore_list.go index 4536da4d1..27c0824e7 100644 --- a/operator/operatorcommon/ignore_list.go +++ b/operator/operatorcommon/ignore_list.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - clusterutil "github.com/ovrclk/provider-services/cluster/util" + clusterutil "github.com/akash-network/provider/cluster/util" ) type IgnoreListReadOnly interface { diff --git a/operator/operatorcommon/ignore_list_test.go b/operator/operatorcommon/ignore_list_test.go index 71ec692fe..cbd5ee5f3 100644 --- a/operator/operatorcommon/ignore_list_test.go +++ b/operator/operatorcommon/ignore_list_test.go @@ -3,7 +3,7 @@ package operatorcommon import ( "bytes" "encoding/json" - "github.com/ovrclk/akash/testutil" + "github.com/akash-network/node/testutil" "github.com/stretchr/testify/require" "io" "testing" diff --git a/operator/operatorcommon/operator_config.go b/operator/operatorcommon/operator_config.go index 4c6aa6f19..2d3a78db9 100644 --- a/operator/operatorcommon/operator_config.go +++ b/operator/operatorcommon/operator_config.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/viper" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" ) type OperatorConfig struct { diff --git a/operator/operatorcommon/operator_flags.go b/operator/operatorcommon/operator_flags.go index 15a6c366c..3614e5092 100644 --- a/operator/operatorcommon/operator_flags.go +++ b/operator/operatorcommon/operator_flags.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" ) const ( diff --git a/operator/operatorcommon/operator_server.go b/operator/operatorcommon/operator_server.go index f88175204..bc3393a32 100644 --- a/operator/operatorcommon/operator_server.go +++ b/operator/operatorcommon/operator_server.go @@ -8,7 +8,7 @@ import ( "github.com/gorilla/mux" - "github.com/ovrclk/provider-services/gateway/utils" + "github.com/akash-network/provider/gateway/utils" ) type PrepareFlagFn func() diff --git a/operator/waiter/waiter_test.go b/operator/waiter/waiter_test.go index fbecd7952..fd3291a68 100644 --- a/operator/waiter/waiter_test.go +++ b/operator/waiter/waiter_test.go @@ -2,7 +2,7 @@ package waiter import ( "context" - "github.com/ovrclk/akash/testutil" + "github.com/akash-network/node/testutil" "github.com/stretchr/testify/require" "io" "testing" diff --git a/pkg/apis/akash.network/v1/doc.go b/pkg/apis/akash.network/v1/doc.go index 080f98cb6..18edee2d5 100644 --- a/pkg/apis/akash.network/v1/doc.go +++ b/pkg/apis/akash.network/v1/doc.go @@ -5,7 +5,7 @@ // Package v1 is the initial version of types which integrate with the Kubernetes API. // -// Contains the Stack Definition Language(pkg: github.com/ovrclk/akash/sdl) Manifest +// Contains the Stack Definition Language(pkg: github.com/akash-network/node/sdl) Manifest // declarations which are written to Kubernetes CRDs for storage. // // Manifest { diff --git a/pkg/apis/akash.network/v1/types.go b/pkg/apis/akash.network/v1/types.go index 0eac8e4e9..ad84529ee 100644 --- a/pkg/apis/akash.network/v1/types.go +++ b/pkg/apis/akash.network/v1/types.go @@ -5,19 +5,19 @@ import ( "math" "strconv" - "github.com/ovrclk/akash/x/market/types/v1beta2/migrate" + "github.com/akash-network/node/x/market/types/v1beta2/migrate" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta1" - clusterutil "github.com/ovrclk/provider-services/cluster/util" + ctypes "github.com/akash-network/provider/cluster/types/v1beta1" + clusterutil "github.com/akash-network/provider/cluster/util" "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" sdk "github.com/cosmos/cosmos-sdk/types" - manifest "github.com/ovrclk/akash/manifest/v1" - types "github.com/ovrclk/akash/types/v1beta1" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta1" + manifest "github.com/akash-network/node/manifest/v1" + types "github.com/akash-network/node/types/v1beta1" + mtypes "github.com/akash-network/node/x/market/types/v1beta1" ) // +genclient diff --git a/pkg/apis/akash.network/v2beta1/doc.go b/pkg/apis/akash.network/v2beta1/doc.go index be4052541..4541256b0 100644 --- a/pkg/apis/akash.network/v2beta1/doc.go +++ b/pkg/apis/akash.network/v2beta1/doc.go @@ -5,7 +5,7 @@ // Package v2beta1 is the initial version of types which integrate with the Kubernetes API. // -// Contains the Stack Definition Language(pkg: github.com/ovrclk/akash/sdl) Manifest +// Contains the Stack Definition Language(pkg: github.com/akash-network/node/sdl) Manifest // declarations which are written to Kubernetes CRDs for storage. // // Manifest { diff --git a/pkg/apis/akash.network/v2beta1/k8s_integration_test.go b/pkg/apis/akash.network/v2beta1/k8s_integration_test.go index 3f4c14791..c86dc55c3 100644 --- a/pkg/apis/akash.network/v2beta1/k8s_integration_test.go +++ b/pkg/apis/akash.network/v2beta1/k8s_integration_test.go @@ -19,12 +19,12 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" - atestutil "github.com/ovrclk/akash/testutil" + atestutil "github.com/akash-network/node/testutil" - clusterutil "github.com/ovrclk/provider-services/cluster/util" - crd "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - akashclient "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - mtestutil "github.com/ovrclk/provider-services/testutil/manifest" + clusterutil "github.com/akash-network/provider/cluster/util" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + akashclient "github.com/akash-network/provider/pkg/client/clientset/versioned" + mtestutil "github.com/akash-network/provider/testutil/manifest" ) func TestWriteRead(t *testing.T) { diff --git a/pkg/apis/akash.network/v2beta1/migrate/manifest.go b/pkg/apis/akash.network/v2beta1/migrate/manifest.go index c060e0190..5dff4e8c6 100644 --- a/pkg/apis/akash.network/v2beta1/migrate/manifest.go +++ b/pkg/apis/akash.network/v2beta1/migrate/manifest.go @@ -1,8 +1,8 @@ package migrate import ( - "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + "github.com/akash-network/provider/pkg/apis/akash.network/v1" + "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) func ManifestSpecFromV1(from v1.ManifestSpec) v2beta1.ManifestSpec { diff --git a/pkg/apis/akash.network/v2beta1/migrate/provider_host.go b/pkg/apis/akash.network/v2beta1/migrate/provider_host.go index d6a01e0ee..7f1ec5185 100644 --- a/pkg/apis/akash.network/v2beta1/migrate/provider_host.go +++ b/pkg/apis/akash.network/v2beta1/migrate/provider_host.go @@ -1,8 +1,8 @@ package migrate import ( - v1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" ) func ProviderHostsSpecFromV1(from v1.ProviderHostSpec) v2beta1.ProviderHostSpec { diff --git a/pkg/apis/akash.network/v2beta1/types.go b/pkg/apis/akash.network/v2beta1/types.go index 522da9275..92614222b 100644 --- a/pkg/apis/akash.network/v2beta1/types.go +++ b/pkg/apis/akash.network/v2beta1/types.go @@ -4,18 +4,18 @@ import ( "math" "strconv" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - clusterutil "github.com/ovrclk/provider-services/cluster/util" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + clusterutil "github.com/akash-network/provider/cluster/util" "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" sdk "github.com/cosmos/cosmos-sdk/types" - types "github.com/ovrclk/akash/types/v1beta2" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + types "github.com/akash-network/node/types/v1beta2" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - maniv2beta1 "github.com/ovrclk/akash/manifest/v2beta1" + maniv2beta1 "github.com/akash-network/node/manifest/v2beta1" ) // +genclient diff --git a/pkg/apis/akash.network/v2beta1/types_test.go b/pkg/apis/akash.network/v2beta1/types_test.go index 2e969598d..a22f3287d 100644 --- a/pkg/apis/akash.network/v2beta1/types_test.go +++ b/pkg/apis/akash.network/v2beta1/types_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - atestutil "github.com/ovrclk/akash/testutil" + atestutil "github.com/akash-network/node/testutil" - mtestutil "github.com/ovrclk/provider-services/testutil/manifest" + mtestutil "github.com/akash-network/provider/testutil/manifest" ) func Test_Manifest_encoding(t *testing.T) { diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index 4041d791f..192452c11 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -22,8 +22,8 @@ import ( "fmt" "net/http" - akashv1 "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/typed/akash.network/v1" - akashv2beta1 "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/typed/akash.network/v2beta1" + akashv1 "github.com/akash-network/provider/pkg/client/clientset/versioned/typed/akash.network/v1" + akashv2beta1 "github.com/akash-network/provider/pkg/client/clientset/versioned/typed/akash.network/v2beta1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index b64d50cb5..81245f9fc 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,11 +19,11 @@ limitations under the License. package fake import ( - clientset "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - akashv1 "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/typed/akash.network/v1" - fakeakashv1 "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/typed/akash.network/v1/fake" - akashv2beta1 "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/typed/akash.network/v2beta1" - fakeakashv2beta1 "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake" + clientset "github.com/akash-network/provider/pkg/client/clientset/versioned" + akashv1 "github.com/akash-network/provider/pkg/client/clientset/versioned/typed/akash.network/v1" + fakeakashv1 "github.com/akash-network/provider/pkg/client/clientset/versioned/typed/akash.network/v1/fake" + akashv2beta1 "github.com/akash-network/provider/pkg/client/clientset/versioned/typed/akash.network/v2beta1" + fakeakashv2beta1 "github.com/akash-network/provider/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 15bf95234..421615309 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -19,8 +19,8 @@ limitations under the License. package fake import ( - akashv1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - akashv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + akashv1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + akashv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 41e8afedd..8db189b29 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -19,8 +19,8 @@ limitations under the License. package scheme import ( - akashv1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - akashv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + akashv1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + akashv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v1/akash.network_client.go b/pkg/client/clientset/versioned/typed/akash.network/v1/akash.network_client.go index 5cc784421..555af176c 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v1/akash.network_client.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v1/akash.network_client.go @@ -21,8 +21,8 @@ package v1 import ( "net/http" - v1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/scheme" + v1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + "github.com/akash-network/provider/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_akash.network_client.go b/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_akash.network_client.go index 6541a4cb3..868cf2c08 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_akash.network_client.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_akash.network_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1 "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/typed/akash.network/v1" + v1 "github.com/akash-network/provider/pkg/client/clientset/versioned/typed/akash.network/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_manifest.go b/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_manifest.go index 58ac1aeee..3afedccbf 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_manifest.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_manifest.go @@ -21,7 +21,7 @@ package fake import ( "context" - akashnetworkv1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" + akashnetworkv1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_providerhost.go b/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_providerhost.go index a583cb91f..2d61ef71f 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_providerhost.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v1/fake/fake_providerhost.go @@ -21,7 +21,7 @@ package fake import ( "context" - akashnetworkv1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" + akashnetworkv1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v1/manifest.go b/pkg/client/clientset/versioned/typed/akash.network/v1/manifest.go index a88a1c8c5..d792216ba 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v1/manifest.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v1/manifest.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - scheme "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/scheme" + v1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + scheme "github.com/akash-network/provider/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v1/providerhost.go b/pkg/client/clientset/versioned/typed/akash.network/v1/providerhost.go index db31b81ee..b37e059c6 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v1/providerhost.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v1/providerhost.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - scheme "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/scheme" + v1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + scheme "github.com/akash-network/provider/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/akash.network_client.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/akash.network_client.go index a034f0d68..dd685de21 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/akash.network_client.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/akash.network_client.go @@ -21,8 +21,8 @@ package v2beta1 import ( "net/http" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/scheme" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + "github.com/akash-network/provider/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_akash.network_client.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_akash.network_client.go index b7bf52237..504312740 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_akash.network_client.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_akash.network_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v2beta1 "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/typed/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/client/clientset/versioned/typed/akash.network/v2beta1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_inventory.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_inventory.go index 69ab55004..4f00be709 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_inventory.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_inventory.go @@ -21,7 +21,7 @@ package fake import ( "context" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_inventoryrequest.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_inventoryrequest.go index aba21185e..f03eaf677 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_inventoryrequest.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_inventoryrequest.go @@ -21,7 +21,7 @@ package fake import ( "context" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_manifest.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_manifest.go index 8acf427eb..3df0f7777 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_manifest.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_manifest.go @@ -21,7 +21,7 @@ package fake import ( "context" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_providerhost.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_providerhost.go index c2c73e01a..6e5bc8a57 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_providerhost.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_providerhost.go @@ -21,7 +21,7 @@ package fake import ( "context" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_providerleasedip.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_providerleasedip.go index 7c3a6cc3a..0dccf1c46 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_providerleasedip.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/fake/fake_providerleasedip.go @@ -21,7 +21,7 @@ package fake import ( "context" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/inventory.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/inventory.go index 4a6708396..59d50c453 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/inventory.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/inventory.go @@ -22,8 +22,8 @@ import ( "context" "time" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - scheme "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/scheme" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + scheme "github.com/akash-network/provider/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/inventoryrequest.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/inventoryrequest.go index 50937eee7..f6c70b07a 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/inventoryrequest.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/inventoryrequest.go @@ -22,8 +22,8 @@ import ( "context" "time" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - scheme "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/scheme" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + scheme "github.com/akash-network/provider/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/manifest.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/manifest.go index 09a631b56..42bd8e0d2 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/manifest.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/manifest.go @@ -22,8 +22,8 @@ import ( "context" "time" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - scheme "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/scheme" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + scheme "github.com/akash-network/provider/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/providerhost.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/providerhost.go index 1baf0c795..6c240b807 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/providerhost.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/providerhost.go @@ -22,8 +22,8 @@ import ( "context" "time" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - scheme "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/scheme" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + scheme "github.com/akash-network/provider/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/providerleasedip.go b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/providerleasedip.go index 907f20549..a60560dbf 100644 --- a/pkg/client/clientset/versioned/typed/akash.network/v2beta1/providerleasedip.go +++ b/pkg/client/clientset/versioned/typed/akash.network/v2beta1/providerleasedip.go @@ -22,8 +22,8 @@ import ( "context" "time" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - scheme "github.com/ovrclk/provider-services/pkg/client/clientset/versioned/scheme" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + scheme "github.com/akash-network/provider/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/akash.network/interface.go b/pkg/client/informers/externalversions/akash.network/interface.go index 63cd26d70..84a7e1938 100644 --- a/pkg/client/informers/externalversions/akash.network/interface.go +++ b/pkg/client/informers/externalversions/akash.network/interface.go @@ -19,9 +19,9 @@ limitations under the License. package akash import ( - v1 "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/akash.network/v1" - v2beta1 "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/akash.network/v2beta1" - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/akash-network/provider/pkg/client/informers/externalversions/akash.network/v1" + v2beta1 "github.com/akash-network/provider/pkg/client/informers/externalversions/akash.network/v2beta1" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/akash.network/v1/interface.go b/pkg/client/informers/externalversions/akash.network/v1/interface.go index e0141733a..b9d1cce12 100644 --- a/pkg/client/informers/externalversions/akash.network/v1/interface.go +++ b/pkg/client/informers/externalversions/akash.network/v1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/akash.network/v1/manifest.go b/pkg/client/informers/externalversions/akash.network/v1/manifest.go index 0b6d6a305..736475e90 100644 --- a/pkg/client/informers/externalversions/akash.network/v1/manifest.go +++ b/pkg/client/informers/externalversions/akash.network/v1/manifest.go @@ -22,10 +22,10 @@ import ( "context" time "time" - akashnetworkv1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - versioned "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/ovrclk/provider-services/pkg/client/listers/akash.network/v1" + akashnetworkv1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + versioned "github.com/akash-network/provider/pkg/client/clientset/versioned" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/akash-network/provider/pkg/client/listers/akash.network/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/akash.network/v1/providerhost.go b/pkg/client/informers/externalversions/akash.network/v1/providerhost.go index 41e7a5b2c..df28324a2 100644 --- a/pkg/client/informers/externalversions/akash.network/v1/providerhost.go +++ b/pkg/client/informers/externalversions/akash.network/v1/providerhost.go @@ -22,10 +22,10 @@ import ( "context" time "time" - akashnetworkv1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - versioned "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/ovrclk/provider-services/pkg/client/listers/akash.network/v1" + akashnetworkv1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + versioned "github.com/akash-network/provider/pkg/client/clientset/versioned" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/akash-network/provider/pkg/client/listers/akash.network/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/akash.network/v2beta1/interface.go b/pkg/client/informers/externalversions/akash.network/v2beta1/interface.go index 33d25fe9f..3dec85236 100644 --- a/pkg/client/informers/externalversions/akash.network/v2beta1/interface.go +++ b/pkg/client/informers/externalversions/akash.network/v2beta1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v2beta1 import ( - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/akash.network/v2beta1/inventory.go b/pkg/client/informers/externalversions/akash.network/v2beta1/inventory.go index c8fe5f996..7594f54fc 100644 --- a/pkg/client/informers/externalversions/akash.network/v2beta1/inventory.go +++ b/pkg/client/informers/externalversions/akash.network/v2beta1/inventory.go @@ -22,10 +22,10 @@ import ( "context" time "time" - akashnetworkv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - versioned "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" - v2beta1 "github.com/ovrclk/provider-services/pkg/client/listers/akash.network/v2beta1" + akashnetworkv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + versioned "github.com/akash-network/provider/pkg/client/clientset/versioned" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" + v2beta1 "github.com/akash-network/provider/pkg/client/listers/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/akash.network/v2beta1/inventoryrequest.go b/pkg/client/informers/externalversions/akash.network/v2beta1/inventoryrequest.go index 84dfd0360..1e3656d19 100644 --- a/pkg/client/informers/externalversions/akash.network/v2beta1/inventoryrequest.go +++ b/pkg/client/informers/externalversions/akash.network/v2beta1/inventoryrequest.go @@ -22,10 +22,10 @@ import ( "context" time "time" - akashnetworkv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - versioned "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" - v2beta1 "github.com/ovrclk/provider-services/pkg/client/listers/akash.network/v2beta1" + akashnetworkv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + versioned "github.com/akash-network/provider/pkg/client/clientset/versioned" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" + v2beta1 "github.com/akash-network/provider/pkg/client/listers/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/akash.network/v2beta1/manifest.go b/pkg/client/informers/externalversions/akash.network/v2beta1/manifest.go index f41ee85d3..59791863c 100644 --- a/pkg/client/informers/externalversions/akash.network/v2beta1/manifest.go +++ b/pkg/client/informers/externalversions/akash.network/v2beta1/manifest.go @@ -22,10 +22,10 @@ import ( "context" time "time" - akashnetworkv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - versioned "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" - v2beta1 "github.com/ovrclk/provider-services/pkg/client/listers/akash.network/v2beta1" + akashnetworkv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + versioned "github.com/akash-network/provider/pkg/client/clientset/versioned" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" + v2beta1 "github.com/akash-network/provider/pkg/client/listers/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/akash.network/v2beta1/providerhost.go b/pkg/client/informers/externalversions/akash.network/v2beta1/providerhost.go index acbd09207..3b9acdfce 100644 --- a/pkg/client/informers/externalversions/akash.network/v2beta1/providerhost.go +++ b/pkg/client/informers/externalversions/akash.network/v2beta1/providerhost.go @@ -22,10 +22,10 @@ import ( "context" time "time" - akashnetworkv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - versioned "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" - v2beta1 "github.com/ovrclk/provider-services/pkg/client/listers/akash.network/v2beta1" + akashnetworkv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + versioned "github.com/akash-network/provider/pkg/client/clientset/versioned" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" + v2beta1 "github.com/akash-network/provider/pkg/client/listers/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/akash.network/v2beta1/providerleasedip.go b/pkg/client/informers/externalversions/akash.network/v2beta1/providerleasedip.go index e30a81447..2b8ab9e05 100644 --- a/pkg/client/informers/externalversions/akash.network/v2beta1/providerleasedip.go +++ b/pkg/client/informers/externalversions/akash.network/v2beta1/providerleasedip.go @@ -22,10 +22,10 @@ import ( "context" time "time" - akashnetworkv2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" - versioned "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" - v2beta1 "github.com/ovrclk/provider-services/pkg/client/listers/akash.network/v2beta1" + akashnetworkv2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" + versioned "github.com/akash-network/provider/pkg/client/clientset/versioned" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" + v2beta1 "github.com/akash-network/provider/pkg/client/listers/akash.network/v2beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index 0656b2fcb..1a87c2bf6 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - versioned "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" - akashnetwork "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/akash.network" - internalinterfaces "github.com/ovrclk/provider-services/pkg/client/informers/externalversions/internalinterfaces" + versioned "github.com/akash-network/provider/pkg/client/clientset/versioned" + akashnetwork "github.com/akash-network/provider/pkg/client/informers/externalversions/akash.network" + internalinterfaces "github.com/akash-network/provider/pkg/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 8df95a57e..a50099b2b 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -21,8 +21,8 @@ package externalversions import ( "fmt" - v1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 87a61e9ef..c7099e958 100644 --- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/ovrclk/provider-services/pkg/client/clientset/versioned" + versioned "github.com/akash-network/provider/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/akash.network/v1/manifest.go b/pkg/client/listers/akash.network/v1/manifest.go index d3f564c33..67c2eab13 100644 --- a/pkg/client/listers/akash.network/v1/manifest.go +++ b/pkg/client/listers/akash.network/v1/manifest.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" + v1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/akash.network/v1/providerhost.go b/pkg/client/listers/akash.network/v1/providerhost.go index 35c5d7d7d..3cf34f5ff 100644 --- a/pkg/client/listers/akash.network/v1/providerhost.go +++ b/pkg/client/listers/akash.network/v1/providerhost.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v1" + v1 "github.com/akash-network/provider/pkg/apis/akash.network/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/akash.network/v2beta1/inventory.go b/pkg/client/listers/akash.network/v2beta1/inventory.go index cd055cb70..24b3e2392 100644 --- a/pkg/client/listers/akash.network/v2beta1/inventory.go +++ b/pkg/client/listers/akash.network/v2beta1/inventory.go @@ -19,7 +19,7 @@ limitations under the License. package v2beta1 import ( - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/akash.network/v2beta1/inventoryrequest.go b/pkg/client/listers/akash.network/v2beta1/inventoryrequest.go index 2f45c46be..231d0b348 100644 --- a/pkg/client/listers/akash.network/v2beta1/inventoryrequest.go +++ b/pkg/client/listers/akash.network/v2beta1/inventoryrequest.go @@ -19,7 +19,7 @@ limitations under the License. package v2beta1 import ( - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/akash.network/v2beta1/manifest.go b/pkg/client/listers/akash.network/v2beta1/manifest.go index 21ef2925c..e4c519bc9 100644 --- a/pkg/client/listers/akash.network/v2beta1/manifest.go +++ b/pkg/client/listers/akash.network/v2beta1/manifest.go @@ -19,7 +19,7 @@ limitations under the License. package v2beta1 import ( - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/akash.network/v2beta1/providerhost.go b/pkg/client/listers/akash.network/v2beta1/providerhost.go index bb09ffd1d..d9b2ef6d1 100644 --- a/pkg/client/listers/akash.network/v2beta1/providerhost.go +++ b/pkg/client/listers/akash.network/v2beta1/providerhost.go @@ -19,7 +19,7 @@ limitations under the License. package v2beta1 import ( - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/akash.network/v2beta1/providerleasedip.go b/pkg/client/listers/akash.network/v2beta1/providerleasedip.go index 2da04bc24..b6a7658b1 100644 --- a/pkg/client/listers/akash.network/v2beta1/providerleasedip.go +++ b/pkg/client/listers/akash.network/v2beta1/providerleasedip.go @@ -19,7 +19,7 @@ limitations under the License. package v2beta1 import ( - v2beta1 "github.com/ovrclk/provider-services/pkg/apis/akash.network/v2beta1" + v2beta1 "github.com/akash-network/provider/pkg/apis/akash.network/v2beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/script/provider_migrate_to_hostname_operator.md b/script/provider_migrate_to_hostname_operator.md index 757d8bd9a..51d23420d 100644 --- a/script/provider_migrate_to_hostname_operator.md +++ b/script/provider_migrate_to_hostname_operator.md @@ -59,8 +59,8 @@ The hostname operator is implemented in `_docs/kustomize/akash-hostname-operator ``` images: - - name: ghcr.io/ovrclk/akash:stable - newName: ghcr.io/ovrclk/akash + - name: ghcr.io/akash-network/node:stable + newName: ghcr.io/akash-network/node newTag: v0.14.0 ``` diff --git a/service.go b/service.go index af5c7a51b..3a376246e 100644 --- a/service.go +++ b/service.go @@ -3,25 +3,24 @@ package provider import ( "context" - bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" - aclient "github.com/ovrclk/akash/client" - - "github.com/ovrclk/provider-services/cluster/operatorclients" - clustertypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/operator/waiter" - "github.com/boz/go-lifecycle" - "github.com/cosmos/cosmos-sdk/client" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/pkg/errors" - "github.com/ovrclk/akash/pubsub" - dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2" + "github.com/cosmos/cosmos-sdk/client" + sdk "github.com/cosmos/cosmos-sdk/types" + bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/ovrclk/provider-services/bidengine" - "github.com/ovrclk/provider-services/cluster" - "github.com/ovrclk/provider-services/manifest" - "github.com/ovrclk/provider-services/session" + aclient "github.com/akash-network/node/client" + "github.com/akash-network/node/pubsub" + dtypes "github.com/akash-network/node/x/deployment/types/v1beta2" + + "github.com/akash-network/provider/bidengine" + "github.com/akash-network/provider/cluster" + "github.com/akash-network/provider/cluster/operatorclients" + clustertypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/manifest" + "github.com/akash-network/provider/operator/waiter" + "github.com/akash-network/provider/session" ) // ValidateClient is the interface to check if provider will bid on given groupspec diff --git a/session/session.go b/session/session.go index 088353433..0dddb88dc 100644 --- a/session/session.go +++ b/session/session.go @@ -3,8 +3,8 @@ package session import ( "github.com/tendermint/tendermint/libs/log" - "github.com/ovrclk/akash/client" - ptypes "github.com/ovrclk/akash/x/provider/types/v1beta2" + "github.com/akash-network/node/client" + ptypes "github.com/akash-network/node/x/provider/types/v1beta2" ) // Session interface wraps Log, Client, Provider and ForModule methods diff --git a/testutil/manifest/manifest.go b/testutil/manifest/manifest.go index 65ccdfcc8..69056b4da 100644 --- a/testutil/manifest/manifest.go +++ b/testutil/manifest/manifest.go @@ -3,7 +3,7 @@ package manifest import ( "testing" - manifest "github.com/ovrclk/akash/manifest/v2beta1" + manifest "github.com/akash-network/node/manifest/v2beta1" ) var ( diff --git a/testutil/manifest/manifest_app.go b/testutil/manifest/manifest_app.go index 4a1749eaa..cbed0418e 100644 --- a/testutil/manifest/manifest_app.go +++ b/testutil/manifest/manifest_app.go @@ -3,10 +3,10 @@ package manifest import ( "testing" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - atestutil "github.com/ovrclk/akash/testutil" - "github.com/ovrclk/akash/types/unit" - types "github.com/ovrclk/akash/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + atestutil "github.com/akash-network/node/testutil" + "github.com/akash-network/node/types/unit" + types "github.com/akash-network/node/types/v1beta2" ) // AppManifestGenerator represents a real-world, deployable configuration. diff --git a/testutil/manifest/manifest_overflow.go b/testutil/manifest/manifest_overflow.go index aa08d2c31..631f08b5e 100644 --- a/testutil/manifest/manifest_overflow.go +++ b/testutil/manifest/manifest_overflow.go @@ -4,9 +4,9 @@ import ( "math" "testing" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - atestutil "github.com/ovrclk/akash/testutil" - types "github.com/ovrclk/akash/types/v1beta2" + manifest "github.com/akash-network/node/manifest/v2beta1" + atestutil "github.com/akash-network/node/testutil" + types "github.com/akash-network/node/types/v1beta2" ) // OverflowManifestGenerator generates a manifest maximum integer values diff --git a/testutil/manifest/manifest_rand.go b/testutil/manifest/manifest_rand.go index 9523c7324..3b2a9abd0 100644 --- a/testutil/manifest/manifest_rand.go +++ b/testutil/manifest/manifest_rand.go @@ -5,8 +5,8 @@ import ( "math/rand" "testing" - manifest "github.com/ovrclk/akash/manifest/v2beta1" - atestutil "github.com/ovrclk/akash/testutil" + manifest "github.com/akash-network/node/manifest/v2beta1" + atestutil "github.com/akash-network/node/testutil" ) // RandManifestGenerator generates a manifest with random values diff --git a/testutil/provider/provider.go b/testutil/provider/provider.go index 2e785237e..4aed1ff2b 100644 --- a/testutil/provider/provider.go +++ b/testutil/provider/provider.go @@ -12,13 +12,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" tmcli "github.com/tendermint/tendermint/libs/cli" - testutilcli "github.com/ovrclk/akash/testutil/cli" - mtypes "github.com/ovrclk/akash/x/market/types/v1beta2" + testutilcli "github.com/akash-network/node/testutil/cli" + mtypes "github.com/akash-network/node/x/market/types/v1beta2" - pcmd "github.com/ovrclk/provider-services/cmd/provider-services/cmd" - providerflags "github.com/ovrclk/provider-services/cmd/provider-services/cmd/flags" - "github.com/ovrclk/provider-services/operator/hostnameoperator" - "github.com/ovrclk/provider-services/operator/ipoperator" + pcmd "github.com/akash-network/provider/cmd/provider-services/cmd" + providerflags "github.com/akash-network/provider/cmd/provider-services/cmd/flags" + "github.com/akash-network/provider/operator/hostnameoperator" + "github.com/akash-network/provider/operator/ipoperator" ) const ( diff --git a/testutil/rest/restserver.go b/testutil/rest/restserver.go index f358977ea..2afc6e346 100644 --- a/testutil/rest/restserver.go +++ b/testutil/rest/restserver.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" - akashclient "github.com/ovrclk/akash/client" + akashclient "github.com/akash-network/node/client" - gwutils "github.com/ovrclk/provider-services/gateway/utils" + gwutils "github.com/akash-network/provider/gateway/utils" ) func NewServer(t testing.TB, qclient akashclient.QueryClient, handler http.Handler, certs []tls.Certificate) *httptest.Server { diff --git a/types.go b/types.go index 5b4c43896..cab7a8d65 100644 --- a/types.go +++ b/types.go @@ -3,9 +3,9 @@ package provider import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/ovrclk/provider-services/bidengine" - ctypes "github.com/ovrclk/provider-services/cluster/types/v1beta2" - "github.com/ovrclk/provider-services/manifest" + "github.com/akash-network/provider/bidengine" + ctypes "github.com/akash-network/provider/cluster/types/v1beta2" + "github.com/akash-network/provider/manifest" ) // Status is the data structure that stores Cluster, Bidengine and Manifest details. diff --git a/version/version.go b/version/version.go index 09559392e..05962a1fb 100644 --- a/version/version.go +++ b/version/version.go @@ -10,11 +10,11 @@ // At build time, the variables Name, Version, Commit, and BuildTags // can be passed as build flags as shown in the following example: // -// go build -X github.com/ovrclk/provider-services/version.Name=provider-services \ -// -X github.com/ovrclk/provider-services/version.AppName=provider-services \ -// -X github.com/ovrclk/provider-services/version.Version=1.0 \ -// -X github.com/ovrclk/provider-services/version.Commit=f0f7b7dab7e36c20b757cebce0e8f4fc5b95de60 \ -// -X "github.com/ovrclk/provider-services/version.BuildTags=linux darwin amd64" +// go build -X github.com/akash-network/provider/version.Name=provider-services \ +// -X github.com/akash-network/provider/version.AppName=provider-services \ +// -X github.com/akash-network/provider/version.Version=1.0 \ +// -X github.com/akash-network/provider/version.Commit=f0f7b7dab7e36c20b757cebce0e8f4fc5b95de60 \ +// -X "github.com/akash-network/provider/version.BuildTags=linux darwin amd64" package version import (