File tree Expand file tree Collapse file tree 4 files changed +17
-9
lines changed Expand file tree Collapse file tree 4 files changed +17
-9
lines changed Original file line number Diff line number Diff line change 7
7
8
8
# Resolve package images using ${PKGS} to be used later in COPY --from=.
9
9
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
12
12
13
13
# The base target provides the base for running various tasks against the source
14
14
# code
@@ -83,5 +83,5 @@ FROM scratch AS container
83
83
COPY --from=pkg-ca-certificates / /
84
84
COPY --from=pkg-fhs / /
85
85
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
87
87
ENTRYPOINT [ "/manager" ]
Original file line number Diff line number Diff line change 1
1
REGISTRY ?= ghcr.io
2
- USERNAME ?= talos-systems
2
+ USERNAME ?= siderolabs
3
3
SHA ?= $(shell git describe --match=none --always --abbrev=8 --dirty)
4
4
TAG ?= $(shell git describe --tag --always --dirty)
5
5
BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
@@ -18,8 +18,8 @@ GO_LDFLAGS += -s -w
18
18
19
19
ARTIFACTS := _out
20
20
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
23
23
24
24
BUILD := docker buildx build
25
25
PLATFORM ?= linux/amd64
Original file line number Diff line number Diff line change 1
1
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
3
3
resources:
4
4
- group: controlplane
5
5
kind: TalosControlPlane
Original file line number Diff line number Diff line change @@ -82,6 +82,7 @@ func (suite *IntegrationSuite) SetupSuite() {
82
82
for _ , config := range []struct {
83
83
env string
84
84
providerType clusterv1.ProviderType
85
+ url string
85
86
}{
86
87
{
87
88
env : "CONTROL_PLANE_PROVIDER_COMPONENTS" ,
@@ -90,18 +91,25 @@ func (suite *IntegrationSuite) SetupSuite() {
90
91
{
91
92
env : "BOOTSTRAP_PROVIDER_COMPONENTS" ,
92
93
providerType : clusterv1 .BootstrapProviderType ,
94
+ url : "https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/bootstrap-components.yaml" ,
93
95
},
94
96
} {
95
97
customConfig := os .Getenv (config .env )
96
98
97
- if customConfig != "" {
99
+ if customConfig != "" || config . url != "" {
98
100
if clusterctlConfigs .Providers == nil {
99
101
clusterctlConfigs .Providers = []providerConfig {}
100
102
}
101
103
104
+ url := fmt .Sprintf ("file://%s" , customConfig )
105
+
106
+ if config .url != "" {
107
+ url = config .url
108
+ }
109
+
102
110
clusterctlConfigs .Providers = append (clusterctlConfigs .Providers , providerConfig {
103
111
Name : "talos" ,
104
- URL : fmt . Sprintf ( "file://%s" , customConfig ) ,
112
+ URL : url ,
105
113
ProviderType : config .providerType ,
106
114
})
107
115
}
You can’t perform that action at this time.
0 commit comments