Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CAPI labels to Hardware CRD: #1054

Merged
merged 2 commits into from
Jan 4, 2025
Merged

Add CAPI labels to Hardware CRD: #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1807a4
Add CAPI labels to Hardware CRD:
jacobweinstock Jan 4, 2025
7e1b220
Update ca-certificates version pin:
jacobweinstock Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/v1alpha1/hardware_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ type HardwareList struct {
// +kubebuilder:resource:path=hardware,scope=Namespaced,categories=tinkerbell,singular=hardware,shortName=hw
// +kubebuilder:storageversion
// +kubebuilder:printcolumn:JSONPath=".status.state",name=State,type=string
// +kubebuilder:metadata:labels=clusterctl.cluster.x-k8s.io=
// +kubebuilder:metadata:labels=clusterctl.cluster.x-k8s.io/move=

// Hardware is the Schema for the Hardware API.
type Hardware struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/tink-agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine:3.20.3
ARG TARGETOS
ARG TARGETARCH

RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
RUN apk add --no-cache --update --upgrade ca-certificates=20241121-r0

COPY bin/tink-agent-${TARGETOS}-${TARGETARCH} /usr/bin/tink-agent

Expand Down
2 changes: 1 addition & 1 deletion cmd/tink-controller-v1alpha2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine:3.20.3
ARG TARGETOS
ARG TARGETARCH

RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
RUN apk add --no-cache --update --upgrade ca-certificates=20241121-r0

COPY bin/tink-controller-v1alpha2-${TARGETOS}-${TARGETARCH} /usr/bin/tink-controller

Expand Down
2 changes: 1 addition & 1 deletion cmd/tink-controller/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine:3.20.3
ARG TARGETOS
ARG TARGETARCH

RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
RUN apk add --no-cache --update --upgrade ca-certificates=20241121-r0

COPY bin/tink-controller-${TARGETOS}-${TARGETARCH} /usr/bin/tink-controller

Expand Down
2 changes: 1 addition & 1 deletion cmd/tink-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG TARGETARCH

EXPOSE 42113 42114

RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
RUN apk add --no-cache --update --upgrade ca-certificates=20241121-r0

COPY bin/tink-server-${TARGETOS}-${TARGETARCH} /usr/bin/tink-server

Expand Down
2 changes: 1 addition & 1 deletion cmd/tink-worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine:3.20.3
ARG TARGETOS
ARG TARGETARCH

RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
RUN apk add --no-cache --update --upgrade ca-certificates=20241121-r0

COPY bin/tink-worker-${TARGETOS}-${TARGETARCH} /usr/bin/tink-worker

Expand Down
2 changes: 1 addition & 1 deletion cmd/virtual-worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine:3.20.3
ARG TARGETOS
ARG TARGETARCH

RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
RUN apk add --no-cache --update --upgrade ca-certificates=20241121-r0

COPY bin/virtual-worker-${TARGETOS}-${TARGETARCH} /usr/bin/virtual-worker

Expand Down
3 changes: 3 additions & 0 deletions config/crd/bases/tinkerbell.org_hardware.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
clusterctl.cluster.x-k8s.io: ""
clusterctl.cluster.x-k8s.io/move: ""
name: hardware.tinkerbell.org
spec:
group: tinkerbell.org
Expand Down
Loading