Skip to content

Commit f8ea245

Browse files
committed
fix: remove CA bundle
See siderolabs/cluster-api-bootstrap-provider-talos#195 Also fix the local release assets path, so that provider is local-installable. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 74f637e commit f8ea245

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.drone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ steps:
167167
- sha512
168168
draft: true
169169
files:
170-
- _out/*
170+
- _out/control-plane-talos/*/*
171171
note: _out/RELEASE_NOTES.md
172172
when:
173173
event:

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ RUN cd config/manager \
7272
&& cp config/metadata/metadata.yaml /metadata.yaml
7373

7474
FROM scratch AS release
75-
COPY --from=release-build /control-plane-components.yaml /control-plane-components.yaml
76-
COPY --from=release-build /metadata.yaml /metadata.yaml
75+
ARG TAG
76+
COPY --from=release-build /control-plane-components.yaml /control-plane-talos/${TAG}/control-plane-components.yaml
77+
COPY --from=release-build /metadata.yaml /control-plane-talos/${TAG}/metadata.yaml
78+
7779

7880
FROM build AS binary
7981
ARG GO_BUILDFLAGS

config/crd/patches/webhook_in_taloscontrolplanes.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ spec:
1010
webhook:
1111
conversionReviewVersions: ["v1", "v1beta1"]
1212
clientConfig:
13-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
14-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
15-
caBundle: Cg==
1613
service:
1714
namespace: system
1815
name: webhook-service

0 commit comments

Comments
 (0)