Skip to content

Commit

Permalink
chore: update after org rename
Browse files Browse the repository at this point in the history
Use siderolabs, bump tools/pkgs.

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
  • Loading branch information
smira committed Mar 24, 2022
1 parent e3a1f5a commit 4eb3093
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ ARG PKGS

# Resolve package images using ${PKGS} to be used later in COPY --from=.

FROM ghcr.io/talos-systems/ca-certificates:${PKGS} AS pkg-ca-certificates
FROM ghcr.io/talos-systems/fhs:${PKGS} AS pkg-fhs
FROM ghcr.io/siderolabs/ca-certificates:${PKGS} AS pkg-ca-certificates
FROM ghcr.io/siderolabs/fhs:${PKGS} AS pkg-fhs

# The base target provides the base for running various tasks against the source
# code
Expand Down Expand Up @@ -91,5 +91,5 @@ FROM scratch AS container
COPY --from=pkg-ca-certificates / /
COPY --from=pkg-fhs / /
COPY --from=binary /manager /manager
LABEL org.opencontainers.image.source https://github.com/talos-systems/cluster-api-bootstrap-provider-talos
LABEL org.opencontainers.image.source https://github.com/siderolabs/cluster-api-bootstrap-provider-talos
ENTRYPOINT [ "/manager" ]
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
REGISTRY ?= ghcr.io
USERNAME ?= talos-systems
USERNAME ?= siderolabs
SHA ?= $(shell git describe --match=none --always --abbrev=8 --dirty)
TAG ?= $(shell git describe --tag --always --dirty)
BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
Expand All @@ -9,8 +9,8 @@ NAME := cluster-api-talos-controller
ARTIFACTS := _out
TEST_RUN ?= ./...

TOOLS ?= ghcr.io/talos-systems/tools:v0.9.0
PKGS ?= v0.9.0
TOOLS ?= ghcr.io/siderolabs/tools:v1.0.0
PKGS ?= v1.0.0
TALOS_VERSION ?= v0.14.0
K8S_VERSION ?= 1.23.1

Expand Down Expand Up @@ -129,7 +129,7 @@ check-dirty: ## Verifies that source tree is not dirty
@if test -n "`git status --porcelain`"; then echo "Source tree is dirty"; git status; exit 1 ; fi

conformance: ## Performs policy checks against the commit and source code.
docker run --rm -it -v $(PWD):/src -w /src ghcr.io/talos-systems/conform:v0.1.0-alpha.23 enforce
docker run --rm -it -v $(PWD):/src -w /src ghcr.io/siderolabs/conform:latest enforce

# Make `make test` behave just like `go test` regarding relative paths.
test: ## Run tests.
Expand All @@ -140,7 +140,7 @@ coverage: ## Upload coverage data to codecov.io.
/usr/local/bin/codecov -f coverage.txt -X fix

talosctl:
curl -Lo talosctl https://github.com/talos-systems/talos/releases/download/$(TALOS_VERSION)/talosctl-$(shell uname -s | tr "[:upper:]" "[:lower:]")-amd64
curl -Lo talosctl https://github.com/siderolabs/talos/releases/download/$(TALOS_VERSION)/talosctl-$(shell uname -s | tr "[:upper:]" "[:lower:]")-amd64
chmod +x ./talosctl

env-up: talosctl ## Start development environment.
Expand Down
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
domain: cluster.x-k8s.io
repo: github.com/talos-systems/cluster-api-bootstrap-provider-talos
repo: github.com/siderolabs/cluster-api-bootstrap-provider-talos
resources:
- group: bootstrap
kind: TalosConfig
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ There are a few corequisites and assumptions that go into using this project:

## Installing

CABPT provider should be installed alongside with [CACPPT](https://github.com/talos-systems/cluster-api-control-plane-provider-talos) provider.
CABPT provider should be installed alongside with [CACPPT](https://github.com/siderolabs/cluster-api-control-plane-provider-talos) provider.

```shell
clusterctl init --bootstrap talos --control-plane talos --infrastructure <infrastructure provider>
Expand Down
2 changes: 1 addition & 1 deletion docs/GCP.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This guide will detail how to deploy the Talos provider into an existing Kuberne

To import the image, you must download a .tar.gz talos release, add it to Google storage, and import it as an image.

- Download the `gcp.tar.gz` image from our [Github releases](https://github.com/talos-systems/talos/releases).
- Download the `gcp.tar.gz` image from our [Github releases](https://github.com/siderolabs/talos/releases).

- Follow the [Google instructions](https://cloud.google.com/compute/docs/images/import-existing-image#import_image) on importing an image using cloud storage.

Expand Down
2 changes: 1 addition & 1 deletion hack/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

RELEASE_TOOL_IMAGE="ghcr.io/talos-systems/release-tool:latest"
RELEASE_TOOL_IMAGE="ghcr.io/siderolabs/release-tool:latest"

function release-tool {
docker pull "${RELEASE_TOOL_IMAGE}" >/dev/null
Expand Down
4 changes: 2 additions & 2 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
commit = "HEAD"

project_name = "CAPI Bootstrap Provider Talos"
github_repo = "talos-systems/cluster-api-bootstrap-provider-talos"
match_deps = "^github.com/(talos-systems/[a-zA-Z0-9-]+)$"
github_repo = "siderolabs/cluster-api-bootstrap-provider-talos"
match_deps = "^github.com/(siderolabs/[a-zA-Z0-9-]+)$"

# previous release
previous = "v0.4.0"
Expand Down

0 comments on commit 4eb3093

Please sign in to comment.