Skip to content

Commit

Permalink
feat: rename repo
Browse files Browse the repository at this point in the history
Signed-off-by: Artur Troian <[email protected]>
  • Loading branch information
troian committed Jan 11, 2023
1 parent 90ec674 commit e8af574
Show file tree
Hide file tree
Showing 237 changed files with 1,341 additions and 1,301 deletions.
2 changes: 1 addition & 1 deletion .chglog/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .goreleaser-docker-amd64.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
project_name: provider
env:
- GO111MODULE=on
- DOCKER_CLI_EXPERIMENTAL="enabled"
Expand Down Expand Up @@ -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'
3 changes: 2 additions & 1 deletion .goreleaser-docker-arm64.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
project_name: provider
env:
- GO111MODULE=on
- DOCKER_CLI_EXPERIMENTAL="enabled"
Expand Down Expand Up @@ -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'
57 changes: 29 additions & 28 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
project_name: provider
env:
- GO111MODULE=on
- DOCKER_CLI_EXPERIMENTAL="enabled"
Expand Down Expand Up @@ -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*
Expand All @@ -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*
Expand All @@ -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
Expand All @@ -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. <[email protected]>"
file_name_template: "{{ .ConventionalFileName }}"
file_name_template: "provider-services_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
formats:
- deb
- rpm
Expand All @@ -171,16 +172,16 @@ nfpms:
vendor: "Overclock Labs Inc."
homepage: "https://ovrclk.com"
maintainer: "Overclock Labs Inc. <[email protected]>"
file_name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
file_name_template: "provider-services_{{ .Os }}_{{ .Arch }}"
formats:
- deb
- rpm
license: Apache 2.0

release:
github:
owner: ovrclk
name: provider-services
owner: akash-network
name: provider
prerelease: auto
mode: replace
draft: false
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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/

Expand Down
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion _docs/kustomize/akash-node/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion _docs/kustomize/akash-operator-hostname/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion _docs/kustomize/akash-operator-inventory/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion _docs/kustomize/akash-operator-ip/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions _docs/kustomize/akash-provider/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _docs/kustomize/templates/akash-node/docker-image.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions _docs/kustomize/templates/akash-provider/docker-image.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions _docs/persistenstorage-provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions _docs/provider-k8s-hard-multi-tenancy.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -210,4 +210,4 @@ spec:
- 10.0.0.0/8
- 192.168.0.0/16
- 172.16.0.0/20
```
```
19 changes: 19 additions & 0 deletions _docs/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion _docs/pubsub.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions _run/common-kind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit e8af574

Please sign in to comment.