Skip to content

Commit f184a8e

Browse files
chrisdoherty4chrisdoherty4
authored
Merge pull request #214 from chrisdoherty4/feature/upgrade-tink
2 parents ae2a42d + b6dd46b commit f184a8e

File tree

7 files changed

+89
-281
lines changed

7 files changed

+89
-281
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ generate-manifests: tools ## Generate manifests e.g. CRD, RBAC etc.
200200

201201
.PHONY: docker-build
202202
docker-build: ## Build the docker image for controller-manager
203-
docker build --pull --build-arg ARCH=$(ARCH) --build-arg LDFLAGS="$(LDFLAGS)" . -t $(CONTROLLER_IMG)-$(ARCH):$(TAG)
203+
docker build --no-cache --pull --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg LDFLAGS="$(LDFLAGS)" . -t $(CONTROLLER_IMG)-$(ARCH):$(TAG)
204204
MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
205205
$(MAKE) set-manifest-pull-policy
206206

‎config/default/kustomization.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,19 @@ commonLabels:
1111
cluster.x-k8s.io/provider: infrastructure-tinkerbell
1212

1313
resources:
14-
- namespace.yaml
14+
- namespace.yaml
1515

1616
bases:
17-
- ../crd
18-
- ../rbac
19-
- ../manager
20-
- ../webhook
21-
- ../certmanager
17+
- ../crd
18+
- ../rbac
19+
- ../manager
20+
- ../webhook
21+
- ../certmanager
2222

2323
patchesStrategicMerge:
24-
- manager_image_patch.yaml
25-
- manager_pull_policy.yaml
26-
- manager_webhook_patch.yaml
27-
- webhookcainjection_patch.yaml
24+
- manager_image_patch.yaml
25+
- manager_webhook_patch.yaml
26+
- webhookcainjection_patch.yaml
2827

2928
vars:
3029
- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR

‎config/default/manager_image_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spec:
88
spec:
99
containers:
1010
# Change the value of image field below to your controller image URL
11-
- image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell:dev
11+
- image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell-amd64:dev
1212
name: manager

‎config/default/manager_pull_policy.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎controllers/machine.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ func (mrc *machineReconcileContext) createWorkflow(hardware *tinkv1.Hardware) er
675675
},
676676
Spec: tinkv1.WorkflowSpec{
677677
TemplateRef: mrc.tinkerbellMachine.Name,
678+
HardwareRef: hardware.Name,
678679
HardwareMap: map[string]string{"device_1": hardware.Spec.Metadata.Instance.ID},
679680
},
680681
}

‎go.mod

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ require (
1111
github.com/pkg/errors v0.9.1
1212
github.com/spf13/pflag v1.0.5
1313
github.com/tinkerbell/rufio v0.0.0-20220601004315-4dc2085adc8e
14-
github.com/tinkerbell/tink v0.0.0-20220524234633-0a800a4b5e25
14+
github.com/tinkerbell/tink v0.7.0
1515
k8s.io/api v0.25.0
1616
k8s.io/apimachinery v0.25.0
1717
k8s.io/client-go v0.25.0
1818
k8s.io/component-base v0.25.0
1919
k8s.io/klog/v2 v2.70.1
20-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
20+
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
2121
sigs.k8s.io/cluster-api v1.2.1
2222
sigs.k8s.io/controller-runtime v0.12.3
2323
sigs.k8s.io/controller-tools v0.8.0
@@ -26,9 +26,7 @@ require (
2626
)
2727

2828
require (
29-
github.com/PuerkitoBio/purell v1.1.1 // indirect
30-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
31-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
29+
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
3230
github.com/beorn7/perks v1.0.1 // indirect
3331
github.com/blang/semver v3.5.1+incompatible // indirect
3432
github.com/cespare/xxhash/v2 v2.1.2 // indirect
@@ -37,30 +35,30 @@ require (
3735
github.com/davecgh/go-spew v1.1.1 // indirect
3836
github.com/docker/distribution v2.8.1+incompatible // indirect
3937
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
40-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
38+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4139
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4240
github.com/fatih/color v1.13.0 // indirect
4341
github.com/fsnotify/fsnotify v1.5.4 // indirect
44-
github.com/go-errors/errors v1.0.1 // indirect
42+
github.com/go-errors/errors v1.4.2 // indirect
4543
github.com/go-openapi/jsonpointer v0.19.5 // indirect
46-
github.com/go-openapi/jsonreference v0.19.5 // indirect
47-
github.com/go-openapi/swag v0.19.15 // indirect
44+
github.com/go-openapi/jsonreference v0.20.0 // indirect
45+
github.com/go-openapi/swag v0.22.3 // indirect
4846
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
4947
github.com/gobuffalo/flect v0.2.5 // indirect
5048
github.com/gogo/protobuf v1.3.2 // indirect
5149
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5250
github.com/golang/protobuf v1.5.2 // indirect
53-
github.com/google/gnostic v0.5.7-v3refs // indirect
51+
github.com/google/gnostic v0.6.9 // indirect
5452
github.com/google/gofuzz v1.2.0 // indirect
5553
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
56-
github.com/imdario/mergo v0.3.12 // indirect
57-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
54+
github.com/imdario/mergo v0.3.13 // indirect
55+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5856
github.com/josharian/intern v1.0.0 // indirect
5957
github.com/json-iterator/go v1.1.12 // indirect
6058
github.com/kr/pretty v0.3.0 // indirect
6159
github.com/mailru/easyjson v0.7.7 // indirect
62-
github.com/mattn/go-colorable v0.1.12 // indirect
63-
github.com/mattn/go-isatty v0.0.14 // indirect
60+
github.com/mattn/go-colorable v0.1.13 // indirect
61+
github.com/mattn/go-isatty v0.0.16 // indirect
6462
github.com/mattn/go-runewidth v0.0.13 // indirect
6563
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
6664
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -75,30 +73,30 @@ require (
7573
github.com/prometheus/client_model v0.2.0 // indirect
7674
github.com/prometheus/common v0.32.1 // indirect
7775
github.com/prometheus/procfs v0.7.3 // indirect
78-
github.com/rivo/uniseg v0.2.0 // indirect
79-
github.com/rogpeppe/go-internal v1.6.2 // indirect
76+
github.com/rivo/uniseg v0.3.4 // indirect
77+
github.com/rogpeppe/go-internal v1.8.1 // indirect
8078
github.com/spf13/cobra v1.5.0 // indirect
8179
github.com/xlab/treeprint v1.1.0 // indirect
8280
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
8381
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
84-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
82+
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
8583
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
86-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
87-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
84+
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
85+
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
8886
golang.org/x/text v0.3.7 // indirect
8987
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
9088
golang.org/x/tools v0.1.12 // indirect
9189
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
9290
google.golang.org/appengine v1.6.7 // indirect
93-
google.golang.org/protobuf v1.28.0 // indirect
94-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
91+
google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf // indirect
92+
google.golang.org/protobuf v1.28.1 // indirect
9593
gopkg.in/inf.v0 v0.9.1 // indirect
9694
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9795
gopkg.in/yaml.v2 v2.4.0 // indirect
9896
gopkg.in/yaml.v3 v3.0.1 // indirect
99-
k8s.io/apiextensions-apiserver v0.24.2 // indirect
97+
k8s.io/apiextensions-apiserver v0.25.0 // indirect
10098
k8s.io/cluster-bootstrap v0.24.0 // indirect
101-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
99+
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
102100
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
103101
sigs.k8s.io/kustomize/api v0.12.1 // indirect
104102
sigs.k8s.io/kustomize/cmd/config v0.10.9 // indirect

0 commit comments

Comments
 (0)