Skip to content

Commit 0a1eebd

Browse files
committed
chore: rename github organization to siderolabs
Go module import paths still use talos-systems, go.mod module path is updated. Introduce url replacement for CABPT in the integration tests. Signed-off-by: Artem Chernyshev <[email protected]>
1 parent d2575f4 commit 0a1eebd

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ARG PKGS
77

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

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

1313
# The base target provides the base for running various tasks against the source
1414
# code
@@ -83,5 +83,5 @@ FROM scratch AS container
8383
COPY --from=pkg-ca-certificates / /
8484
COPY --from=pkg-fhs / /
8585
COPY --from=binary /manager /manager
86-
LABEL org.opencontainers.image.source https://github.com/talos-systems/cluster-api-control-plane-provider-talos
86+
LABEL org.opencontainers.image.source https://github.com/siderolabs/cluster-api-control-plane-provider-talos
8787
ENTRYPOINT [ "/manager" ]

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= ghcr.io
2-
USERNAME ?= talos-systems
2+
USERNAME ?= siderolabs
33
SHA ?= $(shell git describe --match=none --always --abbrev=8 --dirty)
44
TAG ?= $(shell git describe --tag --always --dirty)
55
BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
@@ -18,8 +18,8 @@ GO_LDFLAGS += -s -w
1818

1919
ARTIFACTS := _out
2020

21-
TOOLS ?= ghcr.io/talos-systems/tools:v0.9.0
22-
PKGS ?= v0.9.0
21+
TOOLS ?= ghcr.io/siderolabs/tools:v1.0.0
22+
PKGS ?= v1.0.0
2323

2424
BUILD := docker buildx build
2525
PLATFORM ?= linux/amd64

PROJECT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
domain: controlplane.cluster.x-k8s.io
2-
repo: github.com/talos-systems/cluster-api-control-plane-provider-talos
2+
repo: github.com/siderolabs/cluster-api-control-plane-provider-talos
33
resources:
44
- group: controlplane
55
kind: TalosControlPlane

internal/integration/integration_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ func (suite *IntegrationSuite) SetupSuite() {
8282
for _, config := range []struct {
8383
env string
8484
providerType clusterv1.ProviderType
85+
url string
8586
}{
8687
{
8788
env: "CONTROL_PLANE_PROVIDER_COMPONENTS",
@@ -90,18 +91,25 @@ func (suite *IntegrationSuite) SetupSuite() {
9091
{
9192
env: "BOOTSTRAP_PROVIDER_COMPONENTS",
9293
providerType: clusterv1.BootstrapProviderType,
94+
url: "https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/bootstrap-components.yaml",
9395
},
9496
} {
9597
customConfig := os.Getenv(config.env)
9698

97-
if customConfig != "" {
99+
if customConfig != "" || config.url != "" {
98100
if clusterctlConfigs.Providers == nil {
99101
clusterctlConfigs.Providers = []providerConfig{}
100102
}
101103

104+
url := fmt.Sprintf("file://%s", customConfig)
105+
106+
if config.url != "" {
107+
url = config.url
108+
}
109+
102110
clusterctlConfigs.Providers = append(clusterctlConfigs.Providers, providerConfig{
103111
Name: "talos",
104-
URL: fmt.Sprintf("file://%s", customConfig),
112+
URL: url,
105113
ProviderType: config.providerType,
106114
})
107115
}

0 commit comments

Comments
 (0)