From 80465c57973d544a421c6f1e69df260f7bc0f775 Mon Sep 17 00:00:00 2001 From: Rahul Ganesh Date: Tue, 10 Dec 2024 00:13:05 +0000 Subject: [PATCH 1/3] Update CAPT and Tink stack components to latest release for consuming L3 provisioning changes Signed-off-by: Rahul Ganesh --- UPSTREAM_PROJECTS.yaml | 18 +- build/lib/helm_replace.sh | 10 +- projects/tinkerbell/boots/ATTRIBUTION.txt | 300 +++++++++++------- projects/tinkerbell/boots/CHECKSUMS | 4 +- projects/tinkerbell/boots/GIT_TAG | 2 +- projects/tinkerbell/boots/GOLANG_VERSION | 2 +- projects/tinkerbell/boots/README.md | 2 +- projects/tinkerbell/charts/GIT_TAG | 2 +- projects/tinkerbell/charts/README.md | 2 +- ...l-for-nginx-and-update-http2-command.patch | 2 +- ...-values-for-flags-when-running-in-ho.patch | 47 --- .../tinkerbell/charts/helm/sedfile.template | 2 +- .../ATTRIBUTION.txt | 209 +++++++----- .../cluster-api-provider-tinkerbell/CHECKSUMS | 4 +- .../cluster-api-provider-tinkerbell/GIT_TAG | 2 +- .../GOLANG_VERSION | 2 +- .../cluster-api-provider-tinkerbell/README.md | 2 +- ...sioned-to-be-used-to-check-hard copy.patch | 43 --- projects/tinkerbell/hegel/ATTRIBUTION.txt | 269 ++++++++++------ projects/tinkerbell/hegel/CHECKSUMS | 4 +- projects/tinkerbell/hegel/GIT_TAG | 2 +- projects/tinkerbell/hegel/GOLANG_VERSION | 2 +- projects/tinkerbell/hegel/README.md | 2 +- projects/tinkerbell/rufio/ATTRIBUTION.txt | 26 +- projects/tinkerbell/rufio/CHECKSUMS | 4 +- projects/tinkerbell/rufio/GIT_TAG | 2 +- projects/tinkerbell/rufio/GOLANG_VERSION | 2 +- projects/tinkerbell/rufio/README.md | 2 +- projects/tinkerbell/tinkerbell-crds/GIT_TAG | 2 +- projects/tinkerbell/tinkerbell-crds/README.md | 2 +- .../tinkerbell-crds/chart/Chart.yaml | 2 +- .../rufio/bmc.tinkerbell.org_jobs.yaml | 62 ++-- .../rufio/bmc.tinkerbell.org_machines.yaml | 92 ++++-- .../rufio/bmc.tinkerbell.org_tasks.yaml | 108 ++++--- .../tinkerbell.org_hardware.yaml | 71 ++--- .../tinkerbell.org_templates.yaml | 33 +- .../tinkerbell.org_workflows.yaml | 143 +++++++-- .../tinkerbell-crds/chart/values.yaml | 2 +- .../tinkerbell-crds/helm/sedfile.template | 2 +- 39 files changed, 862 insertions(+), 627 deletions(-) delete mode 100644 projects/tinkerbell/charts/helm/patches/0002-Use-smee-default-values-for-flags-when-running-in-ho.patch delete mode 100644 projects/tinkerbell/cluster-api-provider-tinkerbell/patches/0001-Allow-inUse-and-provisioned-to-be-used-to-check-hard copy.patch diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index ce947c5e4c..12b65f4829 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -267,20 +267,20 @@ projects: repos: - name: boots versions: - - tag: v0.11.0 - go_version: "1.21" + - tag: v0.15.1 + go_version: "1.23" - name: charts versions: - - tag: v0.4.5 + - tag: v0.6.2 go_version: "1.21" - name: cluster-api-provider-tinkerbell versions: - - tag: v0.5.3 - go_version: "1.21" + - tag: v0.6.1 + go_version: "1.23" - name: hegel versions: - - tag: v0.12.0 - go_version: "1.21" + - tag: v0.14.2 + go_version: "1.22" - name: hook versions: - tag: v0.9.1 @@ -295,8 +295,8 @@ projects: go_version: N/A - name: rufio versions: - - tag: v0.5.2 - go_version: "1.23" + - tag: v0.6.1 + go_version: "1.22" - name: tink versions: - tag: v0.10.1 diff --git a/build/lib/helm_replace.sh b/build/lib/helm_replace.sh index 3a3209b79c..5f34535b30 100755 --- a/build/lib/helm_replace.sh +++ b/build/lib/helm_replace.sh @@ -39,10 +39,12 @@ DEST_DIR=${OUTPUT_DIR}/helm/${CHART_NAME} # TEMPLATE_DIR=helm/templates SEDFILE=${OUTPUT_DIR}/helm/sedfile -for file in Chart.yaml values.yaml -do - build::common::echo_and_run $SED -f ${SEDFILE} -i ${DEST_DIR}/${file} -done +build::common::echo_and_run $SED -f ${SEDFILE} -i ${DEST_DIR}/Chart.yaml + +# Process values.yaml if it exists +if [ -f ${DEST_DIR}/values.yaml ]; then + build::common::echo_and_run $SED -f ${SEDFILE} -i ${DEST_DIR}/values.yaml +fi if [ -d ${OUTPUT_DIR}/helm/${CHART_NAME}/crds ]; then for file in crds/*.yaml diff --git a/projects/tinkerbell/boots/ATTRIBUTION.txt b/projects/tinkerbell/boots/ATTRIBUTION.txt index ddb7cd87d4..f5bb70c14a 100644 --- a/projects/tinkerbell/boots/ATTRIBUTION.txt +++ b/projects/tinkerbell/boots/ATTRIBUTION.txt @@ -1,26 +1,20 @@ -** github.com/equinix-labs/otel-init-go; version v0.0.9 -- -https://github.com/equinix-labs/otel-init-go - -** github.com/go-logr/logr; version v1.4.1 -- +** github.com/go-logr/logr; version v1.4.2 -- https://github.com/go-logr/logr ** github.com/go-logr/stdr; version v1.2.2 -- https://github.com/go-logr/stdr -** github.com/go-logr/zapr; version v1.3.0 -- -https://github.com/go-logr/zapr - ** github.com/go-logr/zerologr; version v1.2.3 -- https://github.com/go-logr/zerologr -** github.com/go-openapi/jsonpointer; version v0.20.0 -- +** github.com/go-openapi/jsonpointer; version v0.21.0 -- https://github.com/go-openapi/jsonpointer -** github.com/go-openapi/jsonreference; version v0.20.2 -- +** github.com/go-openapi/jsonreference; version v0.21.0 -- https://github.com/go-openapi/jsonreference -** github.com/go-openapi/swag; version v0.22.4 -- +** github.com/go-openapi/swag; version v0.23.0 -- https://github.com/go-openapi/swag ** github.com/golang/groupcache/lru; version v0.0.0-20210331224755-41bb18bfe9da -- @@ -32,8 +26,8 @@ https://github.com/google/gnostic-models ** github.com/google/gofuzz; version v1.2.0 -- https://github.com/google/gofuzz -** github.com/matttproud/golang_protobuf_extensions/v2/pbutil; version v2.0.0 -- -https://github.com/matttproud/golang_protobuf_extensions/v2 +** github.com/klauspost/compress; version v1.17.9 -- +https://github.com/klauspost/compress ** github.com/modern-go/concurrent; version v0.0.0-20180306012644-bacd9c7ef1dd -- https://github.com/modern-go/concurrent @@ -44,85 +38,91 @@ https://github.com/modern-go/reflect2 ** github.com/peterbourgon/ff/v3; version v3.4.0 -- https://github.com/peterbourgon/ff/v3 -** github.com/prometheus/client_golang/prometheus; version v1.18.0 -- +** github.com/prometheus/client_golang/prometheus; version v1.20.5 -- https://github.com/prometheus/client_golang -** github.com/prometheus/client_model/go; version v0.5.0 -- +** github.com/prometheus/client_model/go; version v0.6.1 -- https://github.com/prometheus/client_model -** github.com/prometheus/common; version v0.45.0 -- +** github.com/prometheus/common; version v0.55.0 -- https://github.com/prometheus/common -** github.com/prometheus/procfs; version v0.12.0 -- +** github.com/prometheus/procfs; version v0.15.1 -- https://github.com/prometheus/procfs -** github.com/tinkerbell/ipxedust; version v0.0.0-20231215220341-a535c5deb47a -- +** github.com/tinkerbell/ipxedust; version v0.0.0-20241108174245-aa0c0298057d -- https://github.com/tinkerbell/ipxedust -** github.com/tinkerbell/smee; version v0.11.0 -- +** github.com/tinkerbell/smee; version v0.15.1 -- https://github.com/tinkerbell/smee -** github.com/tinkerbell/tink/api/v1alpha1; version v0.9.0 -- +** github.com/tinkerbell/tink/api/v1alpha1; version v0.12.1 -- https://github.com/tinkerbell/tink -** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.46.1 -- +** github.com/vishvananda/netlink; version v1.3.0 -- +https://github.com/vishvananda/netlink + +** github.com/vishvananda/netns; version v0.0.4 -- +https://github.com/vishvananda/netns + +** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.57.0 -- https://github.com/open-telemetry/opentelemetry-go-contrib -** go.opentelemetry.io/otel; version v1.21.0 -- +** go.opentelemetry.io/otel; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.21.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.21.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/metric; version v1.21.0 -- +** go.opentelemetry.io/otel/metric; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/sdk; version v1.21.0 -- +** go.opentelemetry.io/otel/sdk; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/trace; version v1.21.0 -- +** go.opentelemetry.io/otel/trace; version v1.32.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/proto/otlp; version v1.0.0 -- +** go.opentelemetry.io/proto/otlp; version v1.3.1 -- https://github.com/open-telemetry/opentelemetry-proto-go -** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20231212172506-995d672761c0 -- +** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20241104194629-dd2ea8efbc28 -- https://github.com/googleapis/go-genproto -** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20231212172506-995d672761c0 -- +** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20241104194629-dd2ea8efbc28 -- https://github.com/googleapis/go-genproto -** google.golang.org/grpc; version v1.60.0 -- +** google.golang.org/grpc; version v1.68.0 -- https://github.com/grpc/grpc-go ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** k8s.io/api; version v0.29.0 -- +** k8s.io/api; version v0.31.3 -- https://github.com/kubernetes/api -** k8s.io/apimachinery/pkg; version v0.29.0 -- +** k8s.io/apimachinery/pkg; version v0.31.3 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go; version v0.29.0 -- +** k8s.io/client-go; version v0.31.3 -- https://github.com/kubernetes/client-go -** k8s.io/klog/v2; version v2.110.1 -- +** k8s.io/klog/v2; version v2.130.1 -- https://github.com/kubernetes/klog -** k8s.io/kube-openapi/pkg; version v0.0.0-20231206194836-bf4651e18aa8 -- +** k8s.io/kube-openapi/pkg; version v0.0.0-20240808142205-8e686545bdb8 -- https://github.com/kubernetes/kube-openapi -** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20231206194836-bf4651e18aa8 -- +** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20240808142205-8e686545bdb8 -- https://github.com/kubernetes/kube-openapi -** k8s.io/utils; version v0.0.0-20231127182322-b307cd553661 -- +** k8s.io/utils; version v0.0.0-20240711033017-18e509b52bc8 -- https://github.com/kubernetes/utils -** sigs.k8s.io/controller-runtime/pkg; version v0.16.3 -- +** sigs.k8s.io/controller-runtime/pkg; version v0.19.2 -- https://github.com/kubernetes-sigs/controller-runtime ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- @@ -341,10 +341,6 @@ https://github.com/kubernetes-sigs/yaml limitations under the License. -* For github.com/matttproud/golang_protobuf_extensions/v2/pbutil see also this required NOTICE: -Copyright 2012 Matt T. Proud (matt.proud@gmail.com) - - * For github.com/prometheus/client_golang/prometheus see also this required NOTICE: Prometheus instrumentation library for Go applications Copyright 2012-2015 The Prometheus Authors @@ -365,11 +361,6 @@ http://github.com/golang/protobuf/ Copyright 2010 The Go Authors See source code for license details. -Support for streaming Protocol Buffer messages for the Go language (golang). -https://github.com/matttproud/golang_protobuf_extensions -Copyright 2013 Matt T. Proud -Licensed under the Apache License, Version 2.0 - * For github.com/prometheus/client_model/go see also this required NOTICE: Data model artifacts for Prometheus. @@ -459,7 +450,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** dario.cat/mergo; version v1.0.0 -- +** dario.cat/mergo; version v1.0.1 -- https://dario.cat/mergo ** github.com/imdario/mergo; version v0.3.16 -- @@ -496,7 +487,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/evanphx/json-patch/v5; version v5.7.0 -- +** github.com/evanphx/json-patch/v5; version v5.9.0 -- https://github.com/evanphx/json-patch/v5 Copyright (c) 2014, Evan Phoenix @@ -527,7 +518,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/fsnotify/fsnotify; version v1.7.0 -- +** github.com/fsnotify/fsnotify; version v1.8.0 -- https://github.com/fsnotify/fsnotify Copyright © 2012 The Go Authors. All rights reserved. @@ -599,7 +590,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/golang/protobuf; version v1.5.3 -- +** github.com/golang/protobuf; version v1.5.4 -- https://github.com/golang/protobuf Copyright 2010 The Go Authors. All rights reserved. @@ -666,7 +657,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/google/uuid; version v1.5.0 -- +** github.com/google/uuid; version v1.6.0 -- https://github.com/google/uuid Copyright (c) 2009,2014 Google Inc. All rights reserved. @@ -699,7 +690,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.18.1 -- +** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.23.0 -- https://github.com/grpc-ecosystem/grpc-gateway/v2 Copyright (c) 2015, Gengo, Inc. @@ -732,7 +723,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/insomniacslk/dhcp; version v0.0.0-20231206064809-8c70d406f6d2 -- +** github.com/insomniacslk/dhcp; version v0.0.0-20240829085014-a3a4c1f04475 -- https://github.com/insomniacslk/dhcp BSD 3-Clause License @@ -767,6 +758,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ +** github.com/klauspost/compress/internal/snapref; version v1.17.9 -- +https://github.com/klauspost/compress + +Copyright (c) 2011 The Snappy-Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + ** github.com/munnerz/goautoneg; version v0.0.0-20191010083416-a7dc8b61c822 -- https://github.com/munnerz/goautoneg @@ -838,40 +862,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.45.0 -- -https://github.com/prometheus/common +** github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil; version v1.20.5 -- +https://github.com/prometheus/client_golang -Copyright (c) 2011, Open Knowledge Foundation Ltd. -All rights reserved. +Copyright (c) 2013 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - Neither the name of the Open Knowledge Foundation Ltd. nor the - names of its contributors may be used to endorse or promote - products derived from this software without specific prior written - permission. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ------ ** github.com/spf13/pflag; version v1.0.5 -- @@ -908,6 +929,66 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ +** github.com/tinkerbell/smee/internal/iso/internal; version v0.15.1 -- +https://github.com/tinkerbell/smee + +** golang.org/x/crypto/sha3; version v0.29.0 -- +https://golang.org/x/crypto + +** golang.org/x/exp/maps; version v0.0.0-20240808152545-0cdaa3abc0fa -- +https://golang.org/x/exp + +** golang.org/x/net; version v0.31.0 -- +https://golang.org/x/net + +** golang.org/x/oauth2; version v0.23.0 -- +https://golang.org/x/oauth2 + +** golang.org/x/sync/errgroup; version v0.9.0 -- +https://golang.org/x/sync + +** golang.org/x/sys; version v0.27.0 -- +https://golang.org/x/sys + +** golang.org/x/term; version v0.26.0 -- +https://golang.org/x/term + +** golang.org/x/text; version v0.20.0 -- +https://golang.org/x/text + +** golang.org/x/time/rate; version v0.6.0 -- +https://golang.org/x/time + +Copyright 2009 The Go Authors. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google LLC nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + ** github.com/u-root/uio; version v0.0.0-20230305220412-3e8cd9d6bf63 -- https://github.com/u-root/uio @@ -943,37 +1024,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/go; version go1.21.13 -- +** golang.org/go; version go1.23.2 -- https://github.com/golang/go -** golang.org/x/crypto/sha3; version v0.18.0 -- -https://golang.org/x/crypto - -** golang.org/x/exp/maps; version v0.0.0-20231206192017-f3f8817b8deb -- -https://golang.org/x/exp - -** golang.org/x/net; version v0.20.0 -- -https://golang.org/x/net - -** golang.org/x/oauth2; version v0.15.0 -- -https://golang.org/x/oauth2 - -** golang.org/x/sync/errgroup; version v0.6.0 -- -https://golang.org/x/sync - -** golang.org/x/sys/unix; version v0.16.0 -- -https://golang.org/x/sys - -** golang.org/x/term; version v0.16.0 -- -https://golang.org/x/term - -** golang.org/x/text; version v0.14.0 -- -https://golang.org/x/text - -** golang.org/x/time/rate; version v0.5.0 -- -https://golang.org/x/time - -** k8s.io/apimachinery/third_party/forked/golang; version v0.29.0 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.31.3 -- https://github.com/kubernetes/apimachinery Copyright (c) 2009 The Go Authors. All rights reserved. @@ -1006,7 +1060,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.31.0 -- +** google.golang.org/protobuf; version v1.35.1 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -1073,7 +1127,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20231206194836-bf4651e18aa8 -- +** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20240808142205-8e686545bdb8 -- https://github.com/kubernetes/kube-openapi Copyright (c) 2020 The Go Authors. All rights reserved. @@ -1106,7 +1160,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20231127182322-b307cd553661 -- +** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20240711033017-18e509b52bc8 -- https://github.com/kubernetes/utils Copyright (c) 2012 The Go Authors. All rights reserved. @@ -1139,7 +1193,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/davecgh/go-spew/spew; version v1.1.1 -- +** github.com/davecgh/go-spew/spew; version v1.1.2-0.20180830191138-d8f796af33cc -- https://github.com/davecgh/go-spew ISC License @@ -1164,15 +1218,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. https://github.com/beorn7/perks Copyright (C) 2013 Blake Mizerany -** github.com/cenkalti/backoff/v4; version v4.2.1 -- +** github.com/ccoveille/go-safecast; version v1.2.0 -- +https://github.com/ccoVeille/go-safecast +Copyright (c) 2024 ccoVeille + +** github.com/cenkalti/backoff/v4; version v4.3.0 -- https://github.com/cenkalti/backoff/v4 Copyright (c) 2014 Cenk Altı -** github.com/cespare/xxhash/v2; version v2.2.0 -- +** github.com/cespare/xxhash/v2; version v2.3.0 -- https://github.com/cespare/xxhash/v2 Copyright (c) 2016 Caleb Spare -** github.com/emicklei/go-restful/v3; version v3.11.0 -- +** github.com/emicklei/go-restful/v3; version v3.12.1 -- https://github.com/emicklei/go-restful/v3 Copyright (c) 2012,2013 Ernest Micklei @@ -1180,9 +1238,13 @@ Copyright (c) 2012,2013 Ernest Micklei https://github.com/felixge/httpsnoop Copyright (c) 2016 Felix Geisendörfer (felix@debuggable.com) -** github.com/gabriel-vasile/mimetype; version v1.4.3 -- +** github.com/fxamacker/cbor/v2; version v2.7.0 -- +https://github.com/fxamacker/cbor/v2 +Copyright (c) 2019-present Faye Amacker + +** github.com/gabriel-vasile/mimetype; version v1.4.6 -- https://github.com/gabriel-vasile/mimetype -Copyright (c) 2018-2020 Gabriel Vasile +Copyright (c) 2018 Gabriel Vasile ** github.com/go-playground/locales; version v0.14.1 -- https://github.com/go-playground/locales @@ -1192,7 +1254,7 @@ Copyright (c) 2016 Go Playground https://github.com/go-playground/universal-translator Copyright (c) 2016 Go Playground -** github.com/go-playground/validator/v10; version v10.16.0 -- +** github.com/go-playground/validator/v10; version v10.22.1 -- https://github.com/go-playground/validator/v10 Copyright (c) 2015 Dean Karn @@ -1204,7 +1266,11 @@ Copyright (c) 2019 Josh Bleecher Snyder https://github.com/json-iterator/go Copyright (c) 2016 json-iterator -** github.com/leodido/go-urn; version v1.2.4 -- +** github.com/klauspost/compress/zstd/internal/xxhash; version v1.17.9 -- +https://github.com/klauspost/compress +Copyright (c) 2016 Caleb Spare + +** github.com/leodido/go-urn; version v1.4.0 -- https://github.com/leodido/go-urn Copyright (c) 2018 Leonardo Di Donato @@ -1228,17 +1294,13 @@ Copyright (c) 2015 Sebastien Estienne (sebastien.estienne@gmail.com) https://github.com/pin/tftp/v3 Copyright (c) 2016 Dmitri Popov -** github.com/rs/zerolog; version v1.31.0 -- +** github.com/rs/zerolog; version v1.33.0 -- https://github.com/rs/zerolog Copyright (c) 2017 Olivier Poitrey -** go.uber.org/multierr; version v1.11.0 -- -https://github.com/uber-go/multierr -Copyright (c) 2017-2021 Uber Technologies, Inc. - -** go.uber.org/zap; version v1.26.0 -- -https://github.com/uber-go/zap -Copyright (c) 2016-2017 Uber Technologies, Inc. +** github.com/x448/float16; version v0.8.4 -- +https://github.com/x448/float16 +Copyright (c) 2019 Montgomery Edwards⁴⁴⁸ and Faye Amacker Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/projects/tinkerbell/boots/CHECKSUMS b/projects/tinkerbell/boots/CHECKSUMS index bfa1c83844..50cc5f7157 100644 --- a/projects/tinkerbell/boots/CHECKSUMS +++ b/projects/tinkerbell/boots/CHECKSUMS @@ -1,2 +1,2 @@ -d37e0f4f97045e7e58ecfca737795838e6b07de66ac4ec0239216629de6e1605 _output/bin/boots/linux-amd64/smee -f48dc6e48b160068745863735cf6bc1569e2dccff9c6ea653bb89fbcc2b38750 _output/bin/boots/linux-arm64/smee +83f4fc8bb7bbba0d6e4bfb6c370c0d4e3af4bb8179d1f7e3c21a0796063f95f5 _output/bin/boots/linux-amd64/smee +b60547daebf05c2e9de523b3c3c3011d19b0023a8b493d7ef95ba7ef1b85247c _output/bin/boots/linux-arm64/smee diff --git a/projects/tinkerbell/boots/GIT_TAG b/projects/tinkerbell/boots/GIT_TAG index e88c34ff01..2080a12c74 100644 --- a/projects/tinkerbell/boots/GIT_TAG +++ b/projects/tinkerbell/boots/GIT_TAG @@ -1 +1 @@ -v0.11.0 \ No newline at end of file +v0.15.1 \ No newline at end of file diff --git a/projects/tinkerbell/boots/GOLANG_VERSION b/projects/tinkerbell/boots/GOLANG_VERSION index d2ab029d32..a1b6e17d61 100644 --- a/projects/tinkerbell/boots/GOLANG_VERSION +++ b/projects/tinkerbell/boots/GOLANG_VERSION @@ -1 +1 @@ -1.21 +1.23 diff --git a/projects/tinkerbell/boots/README.md b/projects/tinkerbell/boots/README.md index b80a0fd3a2..2b2808f8e9 100644 --- a/projects/tinkerbell/boots/README.md +++ b/projects/tinkerbell/boots/README.md @@ -1,5 +1,5 @@ ## **Boots** -![Version](https://img.shields.io/badge/version-v0.11.0-blue) +![Version](https://img.shields.io/badge/version-v0.15.1-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiTGRiNmxQbk5RTnZNbU41WW53bEdSTXRpVDRLaGxDRXJ1UEFnWkdlMVRGekhwdSttbXhmUWpNVFdOM200UkZZbTR3b3dTWkNXb2R1dnZDUHowQU1tU0VRPSIsIml2UGFyYW1ldGVyU3BlYyI6IjlnMlRWSTlpeXNLYmY3cmIiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [Boots](https://github.com/tinkerbell/boots) service handles DHCP, PXE, tftp, and iPXE for provisions in the Tinkerbell stack. diff --git a/projects/tinkerbell/charts/GIT_TAG b/projects/tinkerbell/charts/GIT_TAG index a423f7f068..45964c6694 100644 --- a/projects/tinkerbell/charts/GIT_TAG +++ b/projects/tinkerbell/charts/GIT_TAG @@ -1 +1 @@ -v0.4.5 +v0.6.2 diff --git a/projects/tinkerbell/charts/README.md b/projects/tinkerbell/charts/README.md index cfa0a52498..e6e812ee9c 100644 --- a/projects/tinkerbell/charts/README.md +++ b/projects/tinkerbell/charts/README.md @@ -1,5 +1,5 @@ # **Tinkerbell Stack Helm Chart** -![Version](https://img.shields.io/badge/version-v0.4.5-blue) +![Version](https://img.shields.io/badge/version-v0.6.2-blue) ![Build Status]() ## Updating diff --git a/projects/tinkerbell/charts/helm/patches/0001-Load-stream-model-for-nginx-and-update-http2-command.patch b/projects/tinkerbell/charts/helm/patches/0001-Load-stream-model-for-nginx-and-update-http2-command.patch index 406d3c4fa2..a7b5975e91 100644 --- a/projects/tinkerbell/charts/helm/patches/0001-Load-stream-model-for-nginx-and-update-http2-command.patch +++ b/projects/tinkerbell/charts/helm/patches/0001-Load-stream-model-for-nginx-and-update-http2-command.patch @@ -1,7 +1,7 @@ From bb2527578cca77908f80981c3f871a1faec3b193 Mon Sep 17 00:00:00 2001 From: Ahree Hong Date: Thu, 13 Jun 2024 11:20:37 -0700 -Subject: [PATCH 1/2] Load stream model for nginx and update http2 command +Subject: [PATCH] Load stream model for nginx and update http2 command Signed-off-by: Ahree Hong --- diff --git a/projects/tinkerbell/charts/helm/patches/0002-Use-smee-default-values-for-flags-when-running-in-ho.patch b/projects/tinkerbell/charts/helm/patches/0002-Use-smee-default-values-for-flags-when-running-in-ho.patch deleted file mode 100644 index f96a05ec70..0000000000 --- a/projects/tinkerbell/charts/helm/patches/0002-Use-smee-default-values-for-flags-when-running-in-ho.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5198bcda3023b34381b0c0b9eb33de4a5604184c Mon Sep 17 00:00:00 2001 -From: Ahree Hong -Date: Wed, 12 Jun 2024 15:01:44 -0700 -Subject: [PATCH 2/2] Use smee default values for flags when running in - hostNetwork=true mode - -Signed-off-by: Ahree Hong ---- - tinkerbell/smee/templates/deployment.yaml | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/tinkerbell/smee/templates/deployment.yaml b/tinkerbell/smee/templates/deployment.yaml -index e0db874..c35e92f 100644 ---- a/tinkerbell/smee/templates/deployment.yaml -+++ b/tinkerbell/smee/templates/deployment.yaml -@@ -45,13 +45,7 @@ spec: - - -backend-kube-namespace={{ .Release.Namespace }} - - -dhcp-addr={{ printf "%v:%v" .Values.dhcp.ip .Values.dhcp.port }} - - -dhcp-enabled={{ .Values.dhcp.enabled }} -- - -dhcp-http-ipxe-binary-url={{include "urlJoiner" (dict "urlDict" .Values.dhcp.httpIPXE.binaryUrl)}} -- - -dhcp-http-ipxe-script-url={{include "urlJoiner" (dict "urlDict" .Values.dhcp.httpIPXE.scriptUrl)}} -- - -dhcp-ip-for-packet={{ .Values.dhcp.ipForPacket }} -- - -dhcp-syslog-ip={{ .Values.dhcp.syslogIp }} -- - -dhcp-tftp-ip={{ .Values.dhcp.tftpIp }}:69 - - -extra-kernel-args={{ join " " ( append .Values.http.additionalKernelArgs ( printf "tink_worker_image=%s" ( required "missing tinkWorkerImage" .Values.tinkWorkerImage ) ) ) }} -- - -http-addr={{ printf "%v:%v" .Values.http.ip .Values.http.port }} - - -http-ipxe-binary-enabled={{ .Values.http.ipxeBinaryEnabled }} - - -http-ipxe-script-enabled={{ .Values.http.ipxeScriptEnabled }} - - -osie-url={{include "urlJoiner" (dict "urlDict" .Values.http.osieUrl)}} -@@ -64,6 +58,14 @@ spec: - - -tftp-addr={{ printf "%v:%v" .Values.tftp.ip .Values.tftp.port }} - - -tftp-enabled={{ .Values.tftp.enabled }} - - -tftp-timeout={{ .Values.tftp.timeout }} -+ {{- if not .Values.hostNetwork }} -+ - -dhcp-http-ipxe-binary-url={{include "urlJoiner" (dict "urlDict" .Values.dhcp.httpIPXE.binaryUrl)}} -+ - -dhcp-http-ipxe-script-url={{include "urlJoiner" (dict "urlDict" .Values.dhcp.httpIPXE.scriptUrl)}} -+ - -dhcp-ip-for-packet={{ .Values.dhcp.ipForPacket }} -+ - -dhcp-syslog-ip={{ .Values.dhcp.syslogIp }} -+ - -dhcp-tftp-ip={{ .Values.dhcp.tftpIp }}:69 -+ - -http-addr={{ printf "%v:%v" .Values.http.ip .Values.http.port }} -+ {{- end}} - {{- range .Values.additionalArgs }} - - {{ . }} - {{- end }} --- -2.45.0 - diff --git a/projects/tinkerbell/charts/helm/sedfile.template b/projects/tinkerbell/charts/helm/sedfile.template index cf96a9a4b9..a98398f4ca 100644 --- a/projects/tinkerbell/charts/helm/sedfile.template +++ b/projects/tinkerbell/charts/helm/sedfile.template @@ -1 +1 @@ -s,0.4.5,${IMAGE_TAG},g +s,v0.6.2,${IMAGE_TAG},g diff --git a/projects/tinkerbell/cluster-api-provider-tinkerbell/ATTRIBUTION.txt b/projects/tinkerbell/cluster-api-provider-tinkerbell/ATTRIBUTION.txt index f5a75e26ce..3b2a22e815 100644 --- a/projects/tinkerbell/cluster-api-provider-tinkerbell/ATTRIBUTION.txt +++ b/projects/tinkerbell/cluster-api-provider-tinkerbell/ATTRIBUTION.txt @@ -1,17 +1,17 @@ -** github.com/go-logr/logr; version v1.4.1 -- +** github.com/go-logr/logr; version v1.4.2 -- https://github.com/go-logr/logr ** github.com/go-logr/zerologr; version v1.2.3 -- https://github.com/go-logr/zerologr -** github.com/go-openapi/jsonpointer; version v0.20.1 -- +** github.com/go-openapi/jsonpointer; version v0.21.0 -- https://github.com/go-openapi/jsonpointer -** github.com/go-openapi/jsonreference; version v0.20.3 -- +** github.com/go-openapi/jsonreference; version v0.21.0 -- https://github.com/go-openapi/jsonreference -** github.com/go-openapi/swag; version v0.22.5 -- +** github.com/go-openapi/swag; version v0.23.0 -- https://github.com/go-openapi/swag ** github.com/golang/groupcache/lru; version v0.0.0-20210331224755-41bb18bfe9da -- @@ -23,8 +23,8 @@ https://github.com/google/gnostic-models ** github.com/google/gofuzz; version v1.2.0 -- https://github.com/google/gofuzz -** github.com/matttproud/golang_protobuf_extensions/v2/pbutil; version v2.0.0 -- -https://github.com/matttproud/golang_protobuf_extensions/v2 +** github.com/klauspost/compress; version v1.17.9 -- +https://github.com/klauspost/compress ** github.com/modern-go/concurrent; version v0.0.0-20180306012644-bacd9c7ef1dd -- https://github.com/modern-go/concurrent @@ -32,25 +32,25 @@ https://github.com/modern-go/concurrent ** github.com/modern-go/reflect2; version v1.0.2 -- https://github.com/modern-go/reflect2 -** github.com/prometheus/client_golang/prometheus; version v1.18.0 -- +** github.com/prometheus/client_golang/prometheus; version v1.20.5 -- https://github.com/prometheus/client_golang -** github.com/prometheus/client_model/go; version v0.5.0 -- +** github.com/prometheus/client_model/go; version v0.6.1 -- https://github.com/prometheus/client_model -** github.com/prometheus/common; version v0.45.0 -- +** github.com/prometheus/common; version v0.55.0 -- https://github.com/prometheus/common -** github.com/prometheus/procfs; version v0.12.0 -- +** github.com/prometheus/procfs; version v0.15.1 -- https://github.com/prometheus/procfs -** github.com/tinkerbell/cluster-api-provider-tinkerbell; version v0.5.3 -- +** github.com/tinkerbell/cluster-api-provider-tinkerbell; version v0.6.1 -- https://github.com/tinkerbell/cluster-api-provider-tinkerbell -** github.com/tinkerbell/rufio/api/v1alpha1; version v0.3.3 -- +** github.com/tinkerbell/rufio/api/v1alpha1; version v0.5.2 -- https://github.com/tinkerbell/rufio -** github.com/tinkerbell/tink/api/v1alpha1; version v0.10.0 -- +** github.com/tinkerbell/tink/api/v1alpha1; version v0.12.1 -- https://github.com/tinkerbell/tink ** gomodules.xyz/jsonpatch/v2; version v2.4.0 -- @@ -59,40 +59,40 @@ https://github.com/gomodules/jsonpatch ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** k8s.io/api; version v0.29.2 -- +** k8s.io/api; version v0.31.3 -- https://github.com/kubernetes/api -** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.29.0 -- +** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.31.0 -- https://github.com/kubernetes/apiextensions-apiserver -** k8s.io/apimachinery/pkg; version v0.29.2 -- +** k8s.io/apimachinery/pkg; version v0.31.3 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go; version v0.29.2 -- +** k8s.io/client-go; version v0.31.3 -- https://github.com/kubernetes/client-go -** k8s.io/cluster-bootstrap/token; version v0.29.0 -- +** k8s.io/cluster-bootstrap/token; version v0.30.3 -- https://github.com/kubernetes/cluster-bootstrap -** k8s.io/component-base; version v0.29.2 -- +** k8s.io/component-base; version v0.31.3 -- https://github.com/kubernetes/component-base -** k8s.io/klog/v2; version v2.110.1 -- +** k8s.io/klog/v2; version v2.130.1 -- https://github.com/kubernetes/klog -** k8s.io/kube-openapi/pkg; version v0.0.0-20231214164306-ab13479f8bf8 -- +** k8s.io/kube-openapi/pkg; version v0.0.0-20240808142205-8e686545bdb8 -- https://github.com/kubernetes/kube-openapi -** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20231214164306-ab13479f8bf8 -- +** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20240808142205-8e686545bdb8 -- https://github.com/kubernetes/kube-openapi -** k8s.io/utils; version v0.0.0-20231127182322-b307cd553661 -- +** k8s.io/utils; version v0.0.0-20240921022957-49e7df575cb6 -- https://github.com/kubernetes/utils -** sigs.k8s.io/cluster-api; version v1.6.3 -- +** sigs.k8s.io/cluster-api; version v1.8.5 -- https://github.com/kubernetes-sigs/cluster-api -** sigs.k8s.io/controller-runtime; version v0.17.0 -- +** sigs.k8s.io/controller-runtime; version v0.19.0 -- https://github.com/kubernetes-sigs/controller-runtime ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- @@ -311,10 +311,6 @@ https://github.com/kubernetes-sigs/yaml limitations under the License. -* For github.com/matttproud/golang_protobuf_extensions/v2/pbutil see also this required NOTICE: -Copyright 2012 Matt T. Proud (matt.proud@gmail.com) - - * For github.com/prometheus/client_golang/prometheus see also this required NOTICE: Prometheus instrumentation library for Go applications Copyright 2012-2015 The Prometheus Authors @@ -335,11 +331,6 @@ http://github.com/golang/protobuf/ Copyright 2010 The Go Authors See source code for license details. -Support for streaming Protocol Buffer messages for the Go language (golang). -https://github.com/matttproud/golang_protobuf_extensions -Copyright 2013 Matt T. Proud -Licensed under the Apache License, Version 2.0 - * For github.com/prometheus/client_model/go see also this required NOTICE: Data model artifacts for Prometheus. @@ -429,7 +420,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/evanphx/json-patch/v5; version v5.8.0 -- +** github.com/evanphx/json-patch/v5; version v5.9.0 -- https://github.com/evanphx/json-patch/v5 Copyright (c) 2014, Evan Phoenix @@ -532,7 +523,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/golang/protobuf; version v1.5.3 -- +** github.com/golang/protobuf; version v1.5.4 -- https://github.com/golang/protobuf Copyright 2010 The Go Authors. All rights reserved. @@ -666,6 +657,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ +** github.com/klauspost/compress/internal/snapref; version v1.17.9 -- +https://github.com/klauspost/compress + +Copyright (c) 2011 The Snappy-Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + ** github.com/munnerz/goautoneg; version v0.0.0-20191010083416-a7dc8b61c822 -- https://github.com/munnerz/goautoneg @@ -703,40 +727,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.45.0 -- -https://github.com/prometheus/common +** github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil; version v1.20.5 -- +https://github.com/prometheus/client_golang -Copyright (c) 2011, Open Knowledge Foundation Ltd. -All rights reserved. +Copyright (c) 2013 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - Neither the name of the Open Knowledge Foundation Ltd. nor the - names of its contributors may be used to endorse or promote - products derived from this software without specific prior written - permission. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ------ ** github.com/spf13/pflag; version v1.0.5 -- @@ -773,34 +794,64 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/go; version go1.21.13 -- +** golang.org/go; version go1.23.2 -- https://github.com/golang/go -** golang.org/x/exp/maps; version v0.0.0-20231219180239-dc181d75b848 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.31.3 -- +https://github.com/kubernetes/apimachinery + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + +** golang.org/x/exp/maps; version v0.0.0-20240808152545-0cdaa3abc0fa -- https://golang.org/x/exp -** golang.org/x/net; version v0.24.0 -- +** golang.org/x/net; version v0.30.0 -- https://golang.org/x/net -** golang.org/x/oauth2; version v0.15.0 -- +** golang.org/x/oauth2; version v0.22.0 -- https://golang.org/x/oauth2 -** golang.org/x/sys/unix; version v0.19.0 -- +** golang.org/x/sys/unix; version v0.26.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.19.0 -- +** golang.org/x/term; version v0.25.0 -- https://golang.org/x/term -** golang.org/x/text; version v0.14.0 -- +** golang.org/x/text; version v0.19.0 -- https://golang.org/x/text -** golang.org/x/time/rate; version v0.5.0 -- +** golang.org/x/time/rate; version v0.6.0 -- https://golang.org/x/time -** k8s.io/apimachinery/third_party/forked/golang; version v0.29.2 -- -https://github.com/kubernetes/apimachinery - -Copyright (c) 2009 The Go Authors. All rights reserved. +Copyright 2009 The Go Authors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -812,7 +863,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -830,7 +881,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.33.0 -- +** google.golang.org/protobuf; version v1.35.1 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -897,7 +948,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20231214164306-ab13479f8bf8 -- +** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20240808142205-8e686545bdb8 -- https://github.com/kubernetes/kube-openapi Copyright (c) 2020 The Go Authors. All rights reserved. @@ -930,7 +981,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20231127182322-b307cd553661 -- +** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20240921022957-49e7df575cb6 -- https://github.com/kubernetes/utils Copyright (c) 2012 The Go Authors. All rights reserved. @@ -992,14 +1043,18 @@ Copyright (C) 2013 Blake Mizerany https://github.com/blang/semver/v4 Copyright (c) 2014 Benedikt Lang -** github.com/cespare/xxhash/v2; version v2.2.0 -- +** github.com/cespare/xxhash/v2; version v2.3.0 -- https://github.com/cespare/xxhash/v2 Copyright (c) 2016 Caleb Spare -** github.com/emicklei/go-restful/v3; version v3.11.0 -- +** github.com/emicklei/go-restful/v3; version v3.12.1 -- https://github.com/emicklei/go-restful/v3 Copyright (c) 2012,2013 Ernest Micklei +** github.com/fxamacker/cbor/v2; version v2.7.0 -- +https://github.com/fxamacker/cbor/v2 +Copyright (c) 2019-present Faye Amacker + ** github.com/gobuffalo/flect; version v1.0.2 -- https://github.com/gobuffalo/flect Copyright (c) 2019 Mark Bates @@ -1012,6 +1067,10 @@ Copyright (c) 2019 Josh Bleecher Snyder https://github.com/json-iterator/go Copyright (c) 2016 json-iterator +** github.com/klauspost/compress/zstd/internal/xxhash; version v1.17.9 -- +https://github.com/klauspost/compress +Copyright (c) 2016 Caleb Spare + ** github.com/mailru/easyjson; version v0.7.7 -- https://github.com/mailru/easyjson Copyright (c) 2016 Mail.Ru Group @@ -1024,14 +1083,18 @@ Copyright (c) 2016 Yasuhiro Matsumoto https://github.com/mattn/go-isatty Copyright (c) Yasuhiro MATSUMOTO -** github.com/onsi/gomega; version v1.33.1 -- +** github.com/onsi/gomega; version v1.35.1 -- https://github.com/onsi/gomega Copyright (c) 2013-2014 Onsi Fakhouri -** github.com/rs/zerolog; version v1.32.0 -- +** github.com/rs/zerolog; version v1.33.0 -- https://github.com/rs/zerolog Copyright (c) 2017 Olivier Poitrey +** github.com/x448/float16; version v0.8.4 -- +https://github.com/x448/float16 +Copyright (c) 2019 Montgomery Edwards⁴⁴⁸ and Faye Amacker + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including diff --git a/projects/tinkerbell/cluster-api-provider-tinkerbell/CHECKSUMS b/projects/tinkerbell/cluster-api-provider-tinkerbell/CHECKSUMS index dec5b7493a..18fbe9fd16 100644 --- a/projects/tinkerbell/cluster-api-provider-tinkerbell/CHECKSUMS +++ b/projects/tinkerbell/cluster-api-provider-tinkerbell/CHECKSUMS @@ -1,2 +1,2 @@ -df85b62d2d88470776a8fd1b4897c22e5ba76021992f9a225cf7ecd1e7b1dc54 _output/bin/cluster-api-provider-tinkerbell/linux-amd64/manager -e0d414a54f086caad6e55ebe32d10dc19192a53677e3b7622c87c126a62f48f4 _output/bin/cluster-api-provider-tinkerbell/linux-arm64/manager +d374a230d98d5375add7054500e7c06d78a9d098829940261b369d8a22bb05e3 _output/bin/cluster-api-provider-tinkerbell/linux-amd64/manager +edb2a7d5350c0666410aef8b30bb279d9eb8caf3d80427594ba5aeb865670bd3 _output/bin/cluster-api-provider-tinkerbell/linux-arm64/manager diff --git a/projects/tinkerbell/cluster-api-provider-tinkerbell/GIT_TAG b/projects/tinkerbell/cluster-api-provider-tinkerbell/GIT_TAG index 850e1b8e94..14909610e6 100644 --- a/projects/tinkerbell/cluster-api-provider-tinkerbell/GIT_TAG +++ b/projects/tinkerbell/cluster-api-provider-tinkerbell/GIT_TAG @@ -1 +1 @@ -v0.5.3 \ No newline at end of file +v0.6.1 diff --git a/projects/tinkerbell/cluster-api-provider-tinkerbell/GOLANG_VERSION b/projects/tinkerbell/cluster-api-provider-tinkerbell/GOLANG_VERSION index d2ab029d32..a1b6e17d61 100644 --- a/projects/tinkerbell/cluster-api-provider-tinkerbell/GOLANG_VERSION +++ b/projects/tinkerbell/cluster-api-provider-tinkerbell/GOLANG_VERSION @@ -1 +1 @@ -1.21 +1.23 diff --git a/projects/tinkerbell/cluster-api-provider-tinkerbell/README.md b/projects/tinkerbell/cluster-api-provider-tinkerbell/README.md index 7270d7acbd..35a3ef2a57 100644 --- a/projects/tinkerbell/cluster-api-provider-tinkerbell/README.md +++ b/projects/tinkerbell/cluster-api-provider-tinkerbell/README.md @@ -1,5 +1,5 @@ ## **Cluster API Provider for Tinkerbell** -![Version](https://img.shields.io/badge/version-v0.5.3-blue) +![Version](https://img.shields.io/badge/version-v0.6.1-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiZ2VEbkM5dXBVeFZhSE5IR2UvdjlNanY1RVo5S29zd0E2M1hiaCtNSEd5U3F2VUdCbkViWHVlclg5a093WVgrRUdqNnJLYUtpWjhqUWJaT0NJb3RaWWFjPSIsIml2UGFyYW1ldGVyU3BlYyI6ImtvQnZHalpsVjBCRk5jN2IiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [Cluster API Provider Tinkerbell (CAPT)](https://github.com/tinkerbell/cluster-api-provider-tinkerbell) is an implementation of the Cluster API for Tinkerbell, which supports declarative infrastructure for Kubernetes cluster creation, configuration and management on Tinkerbell infrastructure. CAPT is designed to allow customers to bootstrap workload clusters using hardware managed by Tinkerbell. These clusters can be enhanced externally with remote power management and secure de-provisioning of instances using [Rufio](https://github.com/tinkerbell/rufio). diff --git a/projects/tinkerbell/cluster-api-provider-tinkerbell/patches/0001-Allow-inUse-and-provisioned-to-be-used-to-check-hard copy.patch b/projects/tinkerbell/cluster-api-provider-tinkerbell/patches/0001-Allow-inUse-and-provisioned-to-be-used-to-check-hard copy.patch deleted file mode 100644 index f133542728..0000000000 --- a/projects/tinkerbell/cluster-api-provider-tinkerbell/patches/0001-Allow-inUse-and-provisioned-to-be-used-to-check-hard copy.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e36d3adba1dba2afc716eb2dc32c18a76164e73f Mon Sep 17 00:00:00 2001 -From: Ahree Hong -Date: Wed, 12 Jun 2024 12:51:20 -0700 -Subject: [PATCH] Allow inUse and provisioned to be used to check hardware - ready - -Signed-off-by: Ahree Hong ---- - controllers/machine_reconcile_scope.go | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/controllers/machine_reconcile_scope.go b/controllers/machine_reconcile_scope.go -index 02ead05..4e5a361 100644 ---- a/controllers/machine_reconcile_scope.go -+++ b/controllers/machine_reconcile_scope.go -@@ -50,6 +50,8 @@ import ( - - const ( - providerIDPlaceholder = "PROVIDER_ID" -+ inUse = "in_use" -+ provisioned = "provisioned" - ) - - var ( -@@ -108,13 +110,13 @@ func (scope *machineReconcileScope) addFinalizer() error { - func isHardwareReady(hw *tinkv1.Hardware) bool { - // if allowpxe false for all interface, hardware ready - if len(hw.Spec.Interfaces) == 0 { -- return false -+ return hw.Spec.Metadata.State == inUse && hw.Spec.Metadata.Instance.State == provisioned - } - - for _, ifc := range hw.Spec.Interfaces { - if ifc.Netboot != nil { - if *ifc.Netboot.AllowPXE { -- return false -+ return hw.Spec.Metadata.State == inUse && hw.Spec.Metadata.Instance.State == provisioned - } - } - } --- -2.45.0 - diff --git a/projects/tinkerbell/hegel/ATTRIBUTION.txt b/projects/tinkerbell/hegel/ATTRIBUTION.txt index 820a140d31..a22a3b8eb4 100644 --- a/projects/tinkerbell/hegel/ATTRIBUTION.txt +++ b/projects/tinkerbell/hegel/ATTRIBUTION.txt @@ -2,7 +2,7 @@ ** github.com/equinix-labs/otel-init-go/otelinit; version v0.0.9 -- https://github.com/equinix-labs/otel-init-go -** github.com/go-logr/logr; version v1.4.1 -- +** github.com/go-logr/logr; version v1.4.2 -- https://github.com/go-logr/logr ** github.com/go-logr/stdr; version v1.2.2 -- @@ -11,13 +11,13 @@ https://github.com/go-logr/stdr ** github.com/go-logr/zerologr; version v1.2.3 -- https://github.com/go-logr/zerologr -** github.com/go-openapi/jsonpointer; version v0.19.6 -- +** github.com/go-openapi/jsonpointer; version v0.21.0 -- https://github.com/go-openapi/jsonpointer -** github.com/go-openapi/jsonreference; version v0.20.2 -- +** github.com/go-openapi/jsonreference; version v0.21.0 -- https://github.com/go-openapi/jsonreference -** github.com/go-openapi/swag; version v0.22.3 -- +** github.com/go-openapi/swag; version v0.23.0 -- https://github.com/go-openapi/swag ** github.com/golang/groupcache/lru; version v0.0.0-20210331224755-41bb18bfe9da -- @@ -29,8 +29,8 @@ https://github.com/google/gnostic-models ** github.com/google/gofuzz; version v1.2.0 -- https://github.com/google/gofuzz -** github.com/matttproud/golang_protobuf_extensions/v2/pbutil; version v2.0.0 -- -https://github.com/matttproud/golang_protobuf_extensions/v2 +** github.com/klauspost/compress; version v1.17.9 -- +https://github.com/klauspost/compress ** github.com/modern-go/concurrent; version v0.0.0-20180306012644-bacd9c7ef1dd -- https://github.com/modern-go/concurrent @@ -38,58 +38,58 @@ https://github.com/modern-go/concurrent ** github.com/modern-go/reflect2; version v1.0.2 -- https://github.com/modern-go/reflect2 -** github.com/prometheus/client_golang/prometheus; version v1.18.0 -- +** github.com/prometheus/client_golang/prometheus; version v1.20.5 -- https://github.com/prometheus/client_golang -** github.com/prometheus/client_model/go; version v0.5.0 -- +** github.com/prometheus/client_model/go; version v0.6.1 -- https://github.com/prometheus/client_model -** github.com/prometheus/common; version v0.45.0 -- +** github.com/prometheus/common; version v0.55.0 -- https://github.com/prometheus/common -** github.com/prometheus/procfs; version v0.12.0 -- +** github.com/prometheus/procfs; version v0.15.1 -- https://github.com/prometheus/procfs ** github.com/spf13/afero; version v1.11.0 -- https://github.com/spf13/afero -** github.com/spf13/cobra; version v1.8.0 -- +** github.com/spf13/cobra; version v1.8.1 -- https://github.com/spf13/cobra -** github.com/tinkerbell/hegel; version v0.12.0 -- +** github.com/tinkerbell/hegel; version v0.14.2 -- https://github.com/tinkerbell/hegel -** github.com/tinkerbell/tink/api/v1alpha1; version v0.9.0 -- +** github.com/tinkerbell/tink/api/v1alpha1; version v0.12.1 -- https://github.com/tinkerbell/tink -** go.opentelemetry.io/otel; version v1.19.0 -- +** go.opentelemetry.io/otel; version v1.31.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.19.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.30.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.19.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.27.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/metric; version v1.19.0 -- +** go.opentelemetry.io/otel/metric; version v1.31.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/sdk; version v1.19.0 -- +** go.opentelemetry.io/otel/sdk; version v1.30.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/trace; version v1.19.0 -- +** go.opentelemetry.io/otel/trace; version v1.31.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/proto/otlp; version v1.0.0 -- +** go.opentelemetry.io/proto/otlp; version v1.3.1 -- https://github.com/open-telemetry/opentelemetry-proto-go -** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20231106174013-bbf56f31fb17 -- +** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20240903143218-8af14fe29dc1 -- https://github.com/googleapis/go-genproto -** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20231120223509-83a465c0220f -- +** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20241007155032-5fefd90f89a9 -- https://github.com/googleapis/go-genproto -** google.golang.org/grpc; version v1.59.0 -- +** google.golang.org/grpc; version v1.67.1 -- https://github.com/grpc/grpc-go ** gopkg.in/ini.v1; version v1.67.0 -- @@ -98,28 +98,28 @@ https://gopkg.in/ini.v1 ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** k8s.io/api; version v0.29.0 -- +** k8s.io/api; version v0.31.3 -- https://github.com/kubernetes/api -** k8s.io/apimachinery/pkg; version v0.29.1 -- +** k8s.io/apimachinery/pkg; version v0.31.3 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go; version v0.29.0 -- +** k8s.io/client-go; version v0.31.3 -- https://github.com/kubernetes/client-go -** k8s.io/klog/v2; version v2.110.1 -- +** k8s.io/klog/v2; version v2.130.1 -- https://github.com/kubernetes/klog -** k8s.io/kube-openapi/pkg; version v0.0.0-20231010175941-2dd684a91f00 -- +** k8s.io/kube-openapi/pkg; version v0.0.0-20240808142205-8e686545bdb8 -- https://github.com/kubernetes/kube-openapi -** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20231010175941-2dd684a91f00 -- +** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20240808142205-8e686545bdb8 -- https://github.com/kubernetes/kube-openapi -** k8s.io/utils; version v0.0.0-20230726121419-3b25d923346b -- +** k8s.io/utils; version v0.0.0-20240711033017-18e509b52bc8 -- https://github.com/kubernetes/utils -** sigs.k8s.io/controller-runtime/pkg; version v0.17.0 -- +** sigs.k8s.io/controller-runtime/pkg; version v0.19.2 -- https://github.com/kubernetes-sigs/controller-runtime ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- @@ -338,10 +338,6 @@ https://github.com/kubernetes-sigs/yaml limitations under the License. -* For github.com/matttproud/golang_protobuf_extensions/v2/pbutil see also this required NOTICE: -Copyright 2012 Matt T. Proud (matt.proud@gmail.com) - - * For github.com/prometheus/client_golang/prometheus see also this required NOTICE: Prometheus instrumentation library for Go applications Copyright 2012-2015 The Prometheus Authors @@ -362,11 +358,6 @@ http://github.com/golang/protobuf/ Copyright 2010 The Go Authors See source code for license details. -Support for streaming Protocol Buffer messages for the Go language (golang). -https://github.com/matttproud/golang_protobuf_extensions -Copyright 2013 Matt T. Proud -Licensed under the Apache License, Version 2.0 - * For github.com/prometheus/client_model/go see also this required NOTICE: Data model artifacts for Prometheus. @@ -486,7 +477,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/evanphx/json-patch/v5; version v5.8.0 -- +** github.com/evanphx/json-patch/v5; version v5.9.0 -- https://github.com/evanphx/json-patch/v5 Copyright (c) 2014, Evan Phoenix @@ -589,7 +580,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/golang/protobuf; version v1.5.3 -- +** github.com/golang/protobuf/proto; version v1.5.4 -- https://github.com/golang/protobuf Copyright 2010 The Go Authors. All rights reserved. @@ -656,7 +647,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/google/uuid; version v1.4.0 -- +** github.com/google/uuid; version v1.6.0 -- https://github.com/google/uuid Copyright (c) 2009,2014 Google Inc. All rights reserved. @@ -689,7 +680,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.18.0 -- +** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.22.0 -- https://github.com/grpc-ecosystem/grpc-gateway/v2 Copyright (c) 2015, Gengo, Inc. @@ -722,7 +713,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/imdario/mergo; version v0.3.12 -- +** github.com/imdario/mergo; version v0.3.16 -- https://github.com/darccio/mergo Copyright (c) 2013 Dario Castañé. All rights reserved. @@ -756,34 +747,30 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/munnerz/goautoneg; version v0.0.0-20191010083416-a7dc8b61c822 -- -https://github.com/munnerz/goautoneg +** github.com/klauspost/compress/internal/snapref; version v1.17.9 -- +https://github.com/klauspost/compress -Copyright (c) 2011, Open Knowledge Foundation Ltd. -All rights reserved. +Copyright (c) 2011 The Snappy-Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - Neither the name of the Open Knowledge Foundation Ltd. nor the - names of its contributors may be used to endorse or promote - products derived from this software without specific prior written - permission. + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY @@ -793,8 +780,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.45.0 -- -https://github.com/prometheus/common +** github.com/munnerz/goautoneg; version v0.0.0-20191010083416-a7dc8b61c822 -- +https://github.com/munnerz/goautoneg Copyright (c) 2011, Open Knowledge Foundation Ltd. All rights reserved. @@ -827,39 +814,49 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------- - -** github.com/sagikazarmark/slog-shim; version v0.1.0 -- -https://github.com/sagikazarmark/slog-shim -** golang.org/go; version go1.21.13 -- -https://github.com/golang/go +------ -** golang.org/x/crypto/sha3; version v0.17.0 -- -https://golang.org/x/crypto +** github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil; version v1.20.5 -- +https://github.com/prometheus/client_golang -** golang.org/x/exp/maps; version v0.0.0-20230905200255-921286631fa9 -- -https://golang.org/x/exp +Copyright (c) 2013 The Go Authors. All rights reserved. -** golang.org/x/net; version v0.19.0 -- -https://golang.org/x/net +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: -** golang.org/x/oauth2; version v0.15.0 -- -https://golang.org/x/oauth2 + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. -** golang.org/x/sys/unix; version v0.16.0 -- -https://golang.org/x/sys +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -** golang.org/x/term; version v0.15.0 -- -https://golang.org/x/term +------ -** golang.org/x/text; version v0.14.0 -- -https://golang.org/x/text +** github.com/sagikazarmark/slog-shim; version v0.1.0 -- +https://github.com/sagikazarmark/slog-shim -** golang.org/x/time/rate; version v0.5.0 -- -https://golang.org/x/time +** golang.org/go; version go1.22.8 -- +https://github.com/golang/go -** k8s.io/apimachinery/third_party/forked/golang; version v0.29.1 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.31.3 -- https://github.com/kubernetes/apimachinery Copyright (c) 2009 The Go Authors. All rights reserved. @@ -926,7 +923,61 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.31.0 -- +** golang.org/x/crypto/sha3; version v0.28.0 -- +https://golang.org/x/crypto + +** golang.org/x/exp/maps; version v0.0.0-20240808152545-0cdaa3abc0fa -- +https://golang.org/x/exp + +** golang.org/x/net; version v0.30.0 -- +https://golang.org/x/net + +** golang.org/x/oauth2; version v0.22.0 -- +https://golang.org/x/oauth2 + +** golang.org/x/sys; version v0.26.0 -- +https://golang.org/x/sys + +** golang.org/x/term; version v0.25.0 -- +https://golang.org/x/term + +** golang.org/x/text; version v0.19.0 -- +https://golang.org/x/text + +** golang.org/x/time/rate; version v0.6.0 -- +https://golang.org/x/time + +Copyright 2009 The Go Authors. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google LLC nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + +** google.golang.org/protobuf; version v1.35.1 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -993,7 +1044,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20231010175941-2dd684a91f00 -- +** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20240808142205-8e686545bdb8 -- https://github.com/kubernetes/kube-openapi Copyright (c) 2020 The Go Authors. All rights reserved. @@ -1026,7 +1077,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20230726121419-3b25d923346b -- +** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20240711033017-18e509b52bc8 -- https://github.com/kubernetes/utils Copyright (c) 2012 The Go Authors. All rights reserved. @@ -1084,19 +1135,23 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. https://github.com/beorn7/perks Copyright (C) 2013 Blake Mizerany -** github.com/cenkalti/backoff/v4; version v4.2.1 -- +** github.com/cenkalti/backoff/v4; version v4.3.0 -- https://github.com/cenkalti/backoff/v4 Copyright (c) 2014 Cenk Altı -** github.com/cespare/xxhash/v2; version v2.2.0 -- +** github.com/cespare/xxhash/v2; version v2.3.0 -- https://github.com/cespare/xxhash/v2 Copyright (c) 2016 Caleb Spare -** github.com/emicklei/go-restful/v3; version v3.11.0 -- +** github.com/emicklei/go-restful/v3; version v3.12.1 -- https://github.com/emicklei/go-restful/v3 Copyright (c) 2012,2013 Ernest Micklei -** github.com/gabriel-vasile/mimetype; version v1.4.2 -- +** github.com/fxamacker/cbor/v2; version v2.7.0 -- +https://github.com/fxamacker/cbor/v2 +Copyright (c) 2019-present Faye Amacker + +** github.com/gabriel-vasile/mimetype; version v1.4.3 -- https://github.com/gabriel-vasile/mimetype Copyright (c) 2018-2020 Gabriel Vasile @@ -1104,7 +1159,7 @@ Copyright (c) 2018-2020 Gabriel Vasile https://github.com/gin-contrib/sse Copyright (c) 2014 Manuel Martínez-Almeida -** github.com/gin-gonic/gin; version v1.9.1 -- +** github.com/gin-gonic/gin; version v1.10.0 -- https://github.com/gin-gonic/gin Copyright (c) 2014 Manuel Martínez-Almeida @@ -1116,7 +1171,7 @@ Copyright (c) 2016 Go Playground https://github.com/go-playground/universal-translator Copyright (c) 2016 Go Playground -** github.com/go-playground/validator/v10; version v10.14.1 -- +** github.com/go-playground/validator/v10; version v10.20.0 -- https://github.com/go-playground/validator/v10 Copyright (c) 2015 Dean Karn @@ -1128,7 +1183,11 @@ Copyright (c) 2019 Josh Bleecher Snyder https://github.com/json-iterator/go Copyright (c) 2016 json-iterator -** github.com/leodido/go-urn; version v1.2.4 -- +** github.com/klauspost/compress/zstd/internal/xxhash; version v1.17.9 -- +https://github.com/klauspost/compress +Copyright (c) 2016 Caleb Spare + +** github.com/leodido/go-urn; version v1.4.0 -- https://github.com/leodido/go-urn Copyright (c) 2018 Leonardo Di Donato @@ -1140,7 +1199,7 @@ Copyright (c) 2016 Mail.Ru Group https://github.com/mattn/go-colorable Copyright (c) 2016 Yasuhiro Matsumoto -** github.com/mattn/go-isatty; version v0.0.19 -- +** github.com/mattn/go-isatty; version v0.0.20 -- https://github.com/mattn/go-isatty Copyright (c) Yasuhiro MATSUMOTO @@ -1152,15 +1211,15 @@ Copyright (c) 2013 Mitchell Hashimoto https://github.com/packethost/xff Copyright (c) 2015 Sebastien Estienne (sebastien.estienne@gmail.com) -** github.com/rs/zerolog; version v1.31.0 -- +** github.com/rs/zerolog; version v1.33.0 -- https://github.com/rs/zerolog Copyright (c) 2017 Olivier Poitrey -** github.com/spf13/cast; version v1.6.0 -- +** github.com/spf13/cast; version v1.7.0 -- https://github.com/spf13/cast Copyright (c) 2014 Steve Francia -** github.com/spf13/viper; version v1.18.2 -- +** github.com/spf13/viper; version v1.19.0 -- https://github.com/spf13/viper Copyright (c) 2014 Steve Francia @@ -1168,6 +1227,10 @@ Copyright (c) 2014 Steve Francia https://github.com/subosito/gotenv Copyright (c) 2013 Alif Rachmawadi +** github.com/x448/float16; version v0.8.4 -- +https://github.com/x448/float16 +Copyright (c) 2019 Montgomery Edwards⁴⁴⁸ and Faye Amacker + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -1188,7 +1251,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** github.com/pelletier/go-toml/v2; version v2.1.0 -- +** github.com/pelletier/go-toml/v2; version v2.2.2 -- https://github.com/pelletier/go-toml/v2 Copyright (c) 2021 - 2023 Thomas Pelletier @@ -1214,7 +1277,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** github.com/ugorji/go/codec; version v1.2.11 -- +** github.com/ugorji/go/codec; version v1.2.12 -- https://github.com/ugorji/go/codec Copyright (c) 2012-2020 Ugorji Nwoke. diff --git a/projects/tinkerbell/hegel/CHECKSUMS b/projects/tinkerbell/hegel/CHECKSUMS index 753b1e9613..b7d5d75f72 100644 --- a/projects/tinkerbell/hegel/CHECKSUMS +++ b/projects/tinkerbell/hegel/CHECKSUMS @@ -1,2 +1,2 @@ -fdf5f95c20c4263ac924b12d12ebc215f2514eb6c0ceaca26f9ae8ccaa57d29a _output/bin/hegel/linux-amd64/hegel -ad36bf9b4c88d921a3f4401eb3007aca4c8c6fa56cb30ee95705c9b4522e41ec _output/bin/hegel/linux-arm64/hegel +9b60f45286881224c5137cd3e6b538aacd213680a28c0f5cb791495b3102b08a _output/bin/hegel/linux-amd64/hegel +4f294922f294aa7fba6473d10a14b119c7a3e12fdbcd763a4e32003b4cb90446 _output/bin/hegel/linux-arm64/hegel diff --git a/projects/tinkerbell/hegel/GIT_TAG b/projects/tinkerbell/hegel/GIT_TAG index 3061e9e5a2..1434a50501 100644 --- a/projects/tinkerbell/hegel/GIT_TAG +++ b/projects/tinkerbell/hegel/GIT_TAG @@ -1 +1 @@ -v0.12.0 \ No newline at end of file +v0.14.2 \ No newline at end of file diff --git a/projects/tinkerbell/hegel/GOLANG_VERSION b/projects/tinkerbell/hegel/GOLANG_VERSION index d2ab029d32..71f7f51df9 100644 --- a/projects/tinkerbell/hegel/GOLANG_VERSION +++ b/projects/tinkerbell/hegel/GOLANG_VERSION @@ -1 +1 @@ -1.21 +1.22 diff --git a/projects/tinkerbell/hegel/README.md b/projects/tinkerbell/hegel/README.md index 3fcc176d63..63bbfe447f 100644 --- a/projects/tinkerbell/hegel/README.md +++ b/projects/tinkerbell/hegel/README.md @@ -1,5 +1,5 @@ ## **Hegel** -![Version](https://img.shields.io/badge/version-v0.12.0-blue) +![Version](https://img.shields.io/badge/version-v0.14.2-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUFJ0a1NyeGo1SXlHVzFMWFp3YytQTk0zeXMrSE9oYUw2VFM2MUlpa0tkbmh5S3RGYUQwTzI5VC9KVUJ6ZUJYK3NZb05ZaU15SGVMMzFNSTdmL3lzUlBjPSIsIml2UGFyYW1ldGVyU3BlYyI6IllOR29JZFNSRUFoL2ROUkIiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [Hegel](https://github.com/tinkerbell/hegel) is a gRPC and HTTP metadata service for Tinkerbell. Subscribes to changes in metadata, get notified when data is added/removed, etc. diff --git a/projects/tinkerbell/rufio/ATTRIBUTION.txt b/projects/tinkerbell/rufio/ATTRIBUTION.txt index 0a35d2abbc..549bed1a06 100644 --- a/projects/tinkerbell/rufio/ATTRIBUTION.txt +++ b/projects/tinkerbell/rufio/ATTRIBUTION.txt @@ -1,5 +1,5 @@ -** github.com/bmc-toolbox/bmclib/v2; version v2.3.4-0.20241022160847-8a5f5a1a243c -- +** github.com/bmc-toolbox/bmclib/v2; version v2.3.5-0.20241124181818-eb78b9e0a6f9 -- https://github.com/bmc-toolbox/bmclib/v2 ** github.com/bmc-toolbox/common; version v0.0.0-20240806132831-ba8adc6a35e3 -- @@ -56,7 +56,7 @@ https://github.com/prometheus/common ** github.com/prometheus/procfs; version v0.15.1 -- https://github.com/prometheus/procfs -** github.com/tinkerbell/rufio; version v0.5.2 -- +** github.com/tinkerbell/rufio; version v0.6.1 -- https://github.com/tinkerbell/rufio ** github.com/VictorLowther/simplexml; version v0.0.0-20180716164440-0bff93621230 -- @@ -77,16 +77,16 @@ https://github.com/gomodules/jsonpatch ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** k8s.io/api; version v0.31.1 -- +** k8s.io/api; version v0.31.3 -- https://github.com/kubernetes/api ** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.31.0 -- https://github.com/kubernetes/apiextensions-apiserver -** k8s.io/apimachinery/pkg; version v0.31.1 -- +** k8s.io/apimachinery/pkg; version v0.31.3 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go; version v0.31.1 -- +** k8s.io/client-go; version v0.31.3 -- https://github.com/kubernetes/client-go ** k8s.io/klog/v2; version v2.130.1 -- @@ -101,7 +101,7 @@ https://github.com/kubernetes/kube-openapi ** k8s.io/utils; version v0.0.0-20240711033017-18e509b52bc8 -- https://github.com/kubernetes/utils -** sigs.k8s.io/controller-runtime; version v0.19.0 -- +** sigs.k8s.io/controller-runtime; version v0.19.2 -- https://github.com/kubernetes-sigs/controller-runtime ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- @@ -779,7 +779,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/go; version go1.23.2 -- +** golang.org/go; version go1.22.8 -- https://github.com/golang/go ** golang.org/x/exp; version v0.0.0-20240409090435-93d18d7e34b8 -- @@ -791,7 +791,7 @@ https://golang.org/x/oauth2 ** golang.org/x/time/rate; version v0.3.0 -- https://golang.org/x/time -** k8s.io/apimachinery/third_party/forked/golang; version v0.31.1 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.31.3 -- https://github.com/kubernetes/apimachinery Copyright (c) 2009 The Go Authors. All rights reserved. @@ -824,16 +824,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/x/net; version v0.30.0 -- +** golang.org/x/net; version v0.31.0 -- https://golang.org/x/net -** golang.org/x/sys/unix; version v0.26.0 -- +** golang.org/x/sys/unix; version v0.27.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.25.0 -- +** golang.org/x/term; version v0.26.0 -- https://golang.org/x/term -** golang.org/x/text; version v0.19.0 -- +** golang.org/x/text; version v0.20.0 -- https://golang.org/x/text Copyright 2009 The Go Authors. @@ -1024,7 +1024,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. https://github.com/beorn7/perks Copyright (C) 2013 Blake Mizerany -** github.com/ccoveille/go-safecast; version v1.1.0 -- +** github.com/ccoveille/go-safecast; version v1.2.0 -- https://github.com/ccoVeille/go-safecast Copyright (c) 2024 ccoVeille diff --git a/projects/tinkerbell/rufio/CHECKSUMS b/projects/tinkerbell/rufio/CHECKSUMS index c40dcf59c7..fbb2112740 100644 --- a/projects/tinkerbell/rufio/CHECKSUMS +++ b/projects/tinkerbell/rufio/CHECKSUMS @@ -1,2 +1,2 @@ -b3d0f2a45a307426f682aff5dc0a3c4cf738e417d5798d8dbd4333f0c3565b24 _output/bin/rufio/linux-amd64/manager -6e94dd1768874b6afa5d19330493f5029bd7c9c485f5b85dafeb76fbd643be8b _output/bin/rufio/linux-arm64/manager +e6ee02386d186b0d55f834952e49982a4d27e6f2f5f51eda437af955629ec599 _output/bin/rufio/linux-amd64/manager +f0ea8ab46b4cc7f8449a0a38801e860fcd03f13cd15165a7452ea353b4e63e81 _output/bin/rufio/linux-arm64/manager diff --git a/projects/tinkerbell/rufio/GIT_TAG b/projects/tinkerbell/rufio/GIT_TAG index b0c2058e6b..14909610e6 100644 --- a/projects/tinkerbell/rufio/GIT_TAG +++ b/projects/tinkerbell/rufio/GIT_TAG @@ -1 +1 @@ -v0.5.2 +v0.6.1 diff --git a/projects/tinkerbell/rufio/GOLANG_VERSION b/projects/tinkerbell/rufio/GOLANG_VERSION index a1b6e17d61..71f7f51df9 100644 --- a/projects/tinkerbell/rufio/GOLANG_VERSION +++ b/projects/tinkerbell/rufio/GOLANG_VERSION @@ -1 +1 @@ -1.23 +1.22 diff --git a/projects/tinkerbell/rufio/README.md b/projects/tinkerbell/rufio/README.md index 0eb1b657a7..b2928fa32d 100644 --- a/projects/tinkerbell/rufio/README.md +++ b/projects/tinkerbell/rufio/README.md @@ -1,5 +1,5 @@ ## **Rufio** -![Version](https://img.shields.io/badge/version-v0.5.2-blue) +![Version](https://img.shields.io/badge/version-v0.6.1-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoibmZUSnF0RVBLRGhmNENKWVdNa1kzZ2V0UlFOWWJVZmM0N3UzSm12ekZkRm5KL240YmZTWXdTL2p6NXlUdnF4SUdibzFubW41dW4wTWs1c3Y1TmdSNmw0PSIsIml2UGFyYW1ldGVyU3BlYyI6IkVHRnl2M2JGVTZZSWIyZ1UiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [Rufio](https://github.com/tinkerbell/rufio) is a Kubernetes controller for managing baseboard management state and actions. diff --git a/projects/tinkerbell/tinkerbell-crds/GIT_TAG b/projects/tinkerbell/tinkerbell-crds/GIT_TAG index 28af839c0a..a53741c09b 100644 --- a/projects/tinkerbell/tinkerbell-crds/GIT_TAG +++ b/projects/tinkerbell/tinkerbell-crds/GIT_TAG @@ -1 +1 @@ -0.2.5 \ No newline at end of file +0.2.6 \ No newline at end of file diff --git a/projects/tinkerbell/tinkerbell-crds/README.md b/projects/tinkerbell/tinkerbell-crds/README.md index 2ed0b789eb..472077191e 100644 --- a/projects/tinkerbell/tinkerbell-crds/README.md +++ b/projects/tinkerbell/tinkerbell-crds/README.md @@ -1,5 +1,5 @@ # **Tinkerbell Stack Helm Chart** -![Version](https://img.shields.io/badge/version-0.2.5-blue) +![Version](https://img.shields.io/badge/version-0.2.6-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoic0w3TWw2ZDdFblpMMDZtamh2S3RiNmVwbTdRaDVlbmgxWGZkVi9WdGZjMDgvL2J2a1ZGSXJoMVV2dWJlNWZpbjV5Z3k4THRjZ0VyWUlBM0RLTUNWaE4wPSIsIml2UGFyYW1ldGVyU3BlYyI6IllIWGJ1SDFRZm1HM0dnK1giLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) ## Updating diff --git a/projects/tinkerbell/tinkerbell-crds/chart/Chart.yaml b/projects/tinkerbell/tinkerbell-crds/chart/Chart.yaml index 502bf7ca74..b0f0d03252 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/Chart.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.5 +version: 0.2.6 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml index 7077180368..e5b964537e 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 - helm.sh/resource-policy: keep + controller-gen.kubebuilder.io/version: v0.16.4 name: jobs.bmc.tinkerbell.org spec: group: bmc.tinkerbell.org @@ -25,14 +24,19 @@ spec: description: Job is the Schema for the bmcjobs API. properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -40,8 +44,9 @@ spec: description: JobSpec defines the desired state of Job. properties: machineRef: - description: MachineRef represents the Machine resource to execute - the job. All the tasks in the job are executed for the same Machine. + description: |- + MachineRef represents the Machine resource to execute the job. + All the tasks in the job are executed for the same Machine. properties: name: description: Name of the Machine. @@ -54,15 +59,16 @@ spec: - namespace type: object tasks: - description: Tasks represents a list of baseboard management actions - to be executed. The tasks are executed sequentially. Controller - waits for one task to complete before executing the next. If a single - task fails, job execution stops and sets condition Failed. Condition - Completed is set only if all the tasks were successful. + description: |- + Tasks represents a list of baseboard management actions to be executed. + The tasks are executed sequentially. Controller waits for one task to complete before executing the next. + If a single task fails, job execution stops and sets condition Failed. + Condition Completed is set only if all the tasks were successful. items: - description: Action represents the action to be performed. A single - task can only perform one type of action. For example either PowerAction - or OneTimeBootDeviceAction. + description: |- + Action represents the action to be performed. + A single task can only perform one type of action. + For example either PowerAction or OneTimeBootDeviceAction. maxProperties: 1 properties: oneTimeBootDeviceAction: @@ -70,9 +76,9 @@ spec: management one time set boot device operation. properties: device: - description: Devices represents the boot devices, in order - for setting one time boot. Currently only the first device - in the slice is used to set one time boot. + description: |- + Devices represents the boot devices, in order for setting one time boot. + Currently only the first device in the slice is used to set one time boot. items: description: BootDevice represents boot device of the Machine. @@ -102,9 +108,9 @@ spec: kind: type: string mediaURL: - description: mediaURL represents the URL of the image to - be inserted into the virtual media, or empty to eject - media. + description: |- + mediaURL represents the URL of the image to be inserted into the virtual media, or empty to + eject media. type: string required: - kind @@ -120,7 +126,8 @@ spec: description: JobStatus defines the observed state of Job. properties: completionTime: - description: CompletionTime represents time when the job was completed. + description: |- + CompletionTime represents time when the job was completed. The completion time is only set when the job finishes successfully. format: date-time type: string @@ -134,8 +141,9 @@ spec: details about last transition. type: string status: - description: Status is the status of the Job condition. Can - be True or False. + description: |- + Status is the status of the Job condition. + Can be True or False. type: string type: description: Type of the Job condition. diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_machines.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_machines.yaml index 3dc6169489..3e49c84b88 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_machines.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_machines.yaml @@ -3,12 +3,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 - helm.sh/resource-policy: keep + controller-gen.kubebuilder.io/version: v0.16.4 name: machines.bmc.tinkerbell.org - labels: - clusterctl.cluster.x-k8s.io: "" - clusterctl.cluster.x-k8s.io/move: "" spec: group: bmc.tinkerbell.org names: @@ -26,14 +22,19 @@ spec: description: Machine is the Schema for the machines API. properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -45,10 +46,10 @@ spec: Controller. properties: authSecretRef: - description: AuthSecretRef is the SecretReference that contains - authentication information of the Machine. The Secret must contain - username and password keys. This is optional as it is not required - when using the RPC provider. + description: |- + AuthSecretRef is the SecretReference that contains authentication information of the Machine. + The Secret must contain username and password keys. This is optional as it is not required when using + the RPC provider. properties: name: description: name is unique within a namespace to reference @@ -78,11 +79,17 @@ spec: description: IntelAMT contains the options to customize the IntelAMT provider. properties: + hostScheme: + default: http + description: HostScheme determines whether to use http + or https for intelAMT calls. + enum: + - http + - https + type: string port: description: Port that intelAMT will use for calls. type: integer - required: - - port type: object ipmitool: description: IPMITOOL contains the options to customize the @@ -95,6 +102,18 @@ spec: description: Port that ipmitool will use for calls. type: integer type: object + preferredOrder: + description: |- + PreferredOrder allows customizing the order that BMC providers are called. + Providers added to this list will be moved to the front of the default order. + Provider names are case insensitive. + The default order is: ipmitool, asrockrack, gofish, intelamt, dell, supermicro, openbmc. + items: + description: ProviderName is the bmclib specific provider + name. Names are case insensitive. + pattern: (?i)^(ipmitool|asrockrack|gofish|IntelAMT|dell|supermicro|openbmc)$ + type: string + type: array redfish: description: Redfish contains the options to customize the Redfish provider. @@ -102,17 +121,24 @@ spec: port: description: Port that redfish will use for calls. type: integer - required: - - port + systemName: + description: |- + SystemName is the name of the system to use for redfish calls. + With redfish implementations that manage multiple systems via a single endpoint, this allows for specifying the system to manage. + type: string + useBasicAuth: + description: UseBasicAuth for redfish calls. The default + is false which means token based auth is used. + type: boolean type: object rpc: description: RPC contains the options to customize the RPC provider. properties: consumerURL: - description: ConsumerURL is the URL where an rpc consumer/listener - is running and to which we will send and receive all - notifications. + description: |- + ConsumerURL is the URL where an rpc consumer/listener is running + and to which we will send and receive all notifications. type: string experimental: description: Experimental options. @@ -138,9 +164,9 @@ spec: secrets: additionalProperties: items: - description: SecretReference represents a Secret - Reference. It has enough information to retrieve - secret in any namespace + description: |- + SecretReference represents a Secret Reference. It has enough information to retrieve secret + in any namespace properties: name: description: name is unique within a namespace @@ -196,21 +222,19 @@ spec: an HMAC signature to an HTTP request. properties: appendAlgoToHeaderDisabled: - description: 'AppendAlgoToHeaderDisabled decides whether - to append the algorithm to the signature header - or not. Example: X-BMCLIB-Signature becomes X-BMCLIB-Signature-256 - When set to true, a header will be added for each - algorithm. Example: X-BMCLIB-Signature-256 and X-BMCLIB-Signature-512' + description: |- + AppendAlgoToHeaderDisabled decides whether to append the algorithm to the signature header or not. + Example: X-BMCLIB-Signature becomes X-BMCLIB-Signature-256 + When set to true, a header will be added for each algorithm. Example: X-BMCLIB-Signature-256 and X-BMCLIB-Signature-512 type: boolean headerName: description: 'HeaderName is the header name that should contain the signature(s). Example: X-BMCLIB-Signature' type: string includedPayloadHeaders: - description: 'IncludedPayloadHeaders are headers whose - values will be included in the signature payload. - Example: X-BMCLIB-My-Custom-Header All headers will - be deduplicated.' + description: |- + IncludedPayloadHeaders are headers whose values will be included in the signature payload. Example: X-BMCLIB-My-Custom-Header + All headers will be deduplicated. items: type: string type: array diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_tasks.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_tasks.yaml index b8f66454a7..d2bc904fb6 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_tasks.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_tasks.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 - helm.sh/resource-policy: keep + controller-gen.kubebuilder.io/version: v0.16.4 name: tasks.bmc.tinkerbell.org spec: group: bmc.tinkerbell.org @@ -25,14 +24,19 @@ spec: description: Task is the Schema for the Task API. properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -43,10 +47,10 @@ spec: description: Connection represents the Machine connectivity information. properties: authSecretRef: - description: AuthSecretRef is the SecretReference that contains - authentication information of the Machine. The Secret must contain - username and password keys. This is optional as it is not required - when using the RPC provider. + description: |- + AuthSecretRef is the SecretReference that contains authentication information of the Machine. + The Secret must contain username and password keys. This is optional as it is not required when using + the RPC provider. properties: name: description: name is unique within a namespace to reference @@ -76,11 +80,17 @@ spec: description: IntelAMT contains the options to customize the IntelAMT provider. properties: + hostScheme: + default: http + description: HostScheme determines whether to use http + or https for intelAMT calls. + enum: + - http + - https + type: string port: description: Port that intelAMT will use for calls. type: integer - required: - - port type: object ipmitool: description: IPMITOOL contains the options to customize the @@ -93,6 +103,18 @@ spec: description: Port that ipmitool will use for calls. type: integer type: object + preferredOrder: + description: |- + PreferredOrder allows customizing the order that BMC providers are called. + Providers added to this list will be moved to the front of the default order. + Provider names are case insensitive. + The default order is: ipmitool, asrockrack, gofish, intelamt, dell, supermicro, openbmc. + items: + description: ProviderName is the bmclib specific provider + name. Names are case insensitive. + pattern: (?i)^(ipmitool|asrockrack|gofish|IntelAMT|dell|supermicro|openbmc)$ + type: string + type: array redfish: description: Redfish contains the options to customize the Redfish provider. @@ -100,17 +122,24 @@ spec: port: description: Port that redfish will use for calls. type: integer - required: - - port + systemName: + description: |- + SystemName is the name of the system to use for redfish calls. + With redfish implementations that manage multiple systems via a single endpoint, this allows for specifying the system to manage. + type: string + useBasicAuth: + description: UseBasicAuth for redfish calls. The default + is false which means token based auth is used. + type: boolean type: object rpc: description: RPC contains the options to customize the RPC provider. properties: consumerURL: - description: ConsumerURL is the URL where an rpc consumer/listener - is running and to which we will send and receive all - notifications. + description: |- + ConsumerURL is the URL where an rpc consumer/listener is running + and to which we will send and receive all notifications. type: string experimental: description: Experimental options. @@ -136,9 +165,9 @@ spec: secrets: additionalProperties: items: - description: SecretReference represents a Secret - Reference. It has enough information to retrieve - secret in any namespace + description: |- + SecretReference represents a Secret Reference. It has enough information to retrieve secret + in any namespace properties: name: description: name is unique within a namespace @@ -194,21 +223,19 @@ spec: an HMAC signature to an HTTP request. properties: appendAlgoToHeaderDisabled: - description: 'AppendAlgoToHeaderDisabled decides whether - to append the algorithm to the signature header - or not. Example: X-BMCLIB-Signature becomes X-BMCLIB-Signature-256 - When set to true, a header will be added for each - algorithm. Example: X-BMCLIB-Signature-256 and X-BMCLIB-Signature-512' + description: |- + AppendAlgoToHeaderDisabled decides whether to append the algorithm to the signature header or not. + Example: X-BMCLIB-Signature becomes X-BMCLIB-Signature-256 + When set to true, a header will be added for each algorithm. Example: X-BMCLIB-Signature-256 and X-BMCLIB-Signature-512 type: boolean headerName: description: 'HeaderName is the header name that should contain the signature(s). Example: X-BMCLIB-Signature' type: string includedPayloadHeaders: - description: 'IncludedPayloadHeaders are headers whose - values will be included in the signature payload. - Example: X-BMCLIB-My-Custom-Header All headers will - be deduplicated.' + description: |- + IncludedPayloadHeaders are headers whose values will be included in the signature payload. Example: X-BMCLIB-My-Custom-Header + All headers will be deduplicated. items: type: string type: array @@ -230,9 +257,9 @@ spec: one time set boot device operation. properties: device: - description: Devices represents the boot devices, in order - for setting one time boot. Currently only the first device - in the slice is used to set one time boot. + description: |- + Devices represents the boot devices, in order for setting one time boot. + Currently only the first device in the slice is used to set one time boot. items: description: BootDevice represents boot device of the Machine. type: string @@ -261,8 +288,9 @@ spec: kind: type: string mediaURL: - description: mediaURL represents the URL of the image to be - inserted into the virtual media, or empty to eject media. + description: |- + mediaURL represents the URL of the image to be inserted into the virtual media, or empty to + eject media. type: string required: - kind @@ -275,7 +303,8 @@ spec: description: TaskStatus defines the observed state of Task. properties: completionTime: - description: CompletionTime represents time when the task was completed. + description: |- + CompletionTime represents time when the task was completed. The completion time is only set when the task finishes successfully. format: date-time type: string @@ -289,8 +318,9 @@ spec: details about last transition. type: string status: - description: Status is the status of the Task condition. Can - be True or False. + description: |- + Status is the status of the Task condition. + Can be True or False. type: string type: description: Type of the Task condition. diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_hardware.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_hardware.yaml index 25e06c5c85..a32dcfbf0b 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_hardware.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_hardware.yaml @@ -1,14 +1,8 @@ ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 - helm.sh/resource-policy: keep - creationTimestamp: null - labels: - clusterctl.cluster.x-k8s.io: "" - clusterctl.cluster.x-k8s.io/move: "" + controller-gen.kubebuilder.io/version: v0.16.3 name: hardware.tinkerbell.org spec: group: tinkerbell.org @@ -33,16 +27,19 @@ spec: description: Hardware is the Schema for the Hardware API. properties: apiVersion: - description: - "APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: - "Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -50,17 +47,16 @@ spec: description: HardwareSpec defines the desired state of Hardware. properties: bmcRef: - description: - BMCRef contains a relation to a BMC state management - type in the same namespace as the Hardware. This may be used for - BMC management by orchestrators. + description: |- + BMCRef contains a relation to a BMC state management type in the same + namespace as the Hardware. This may be used for BMC management by + orchestrators. properties: apiGroup: - description: + description: |- APIGroup is the group for the resource being referenced. - If APIGroup is not specified, the specified Kind must be in - the core API group. For any other third-party types, APIGroup - is required. + If APIGroup is not specified, the specified Kind must be in the core API group. + For any other third-party types, APIGroup is required. type: string kind: description: Kind is the type of resource being referenced @@ -72,6 +68,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic disks: items: description: Disk represents a disk device for Tinkerbell Hardware. @@ -82,9 +79,7 @@ spec: type: array interfaces: items: - description: - Interface represents a network interface configuration - for Hardware. + description: Interface represents a network interface configuration for Hardware. properties: dhcp: description: DHCP configuration. @@ -125,12 +120,14 @@ spec: uefi: type: boolean vlan_id: - description: - validation pattern for VLANDID is a string - number between 0-4096 + description: validation pattern for VLANDID is a string number between 0-4096 pattern: ^(([0-9][0-9]{0,2}|[1-3][0-9][0-9][0-9]|40([0-8][0-9]|9[0-6]))(,[1-9][0-9]{0,2}|[1-3][0-9][0-9][0-9]|40([0-8][0-9]|9[0-6]))*)$ type: string type: object + disableDhcp: + default: false + description: DisableDHCP disables DHCP for this interface. + type: boolean netboot: description: Netboot configuration. properties: @@ -359,20 +356,20 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: - Resources represents known resources that are available - on a machine. Resources may be used for scheduling by orchestrators. + description: |- + Resources represents known resources that are available on a machine. + Resources may be used for scheduling by orchestrators. type: object tinkVersion: format: int64 type: integer userData: - description: + description: |- UserData is the user data to configure in the hardware's metadata type: string vendorData: - description: + description: |- VendorData is the vendor data to configure in the hardware's metadata type: string @@ -389,9 +386,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_templates.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_templates.yaml index 22742997de..1a7cf72b89 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_templates.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_templates.yaml @@ -1,14 +1,8 @@ ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 - helm.sh/resource-policy: keep - creationTimestamp: null - labels: - clusterctl.cluster.x-k8s.io: "" - clusterctl.cluster.x-k8s.io/move: "" + controller-gen.kubebuilder.io/version: v0.16.3 name: templates.tinkerbell.org spec: group: tinkerbell.org @@ -33,16 +27,19 @@ spec: description: Template is the Schema for the Templates API. properties: apiVersion: - description: - "APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: - "Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -64,9 +61,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_workflows.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_workflows.yaml index b4f14b037a..2bee793717 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_workflows.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_workflows.yaml @@ -1,11 +1,8 @@ ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 - helm.sh/resource-policy: keep - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.16.3 name: workflows.tinkerbell.org spec: group: tinkerbell.org @@ -27,32 +24,64 @@ spec: - jsonPath: .status.state name: State type: string + - jsonPath: .status.currentAction + name: Current-Action + type: string + - jsonPath: .status.templateRending + name: Template-Rendering + type: string name: v1alpha1 schema: openAPIV3Schema: description: Workflow is the Schema for the Workflows API. properties: apiVersion: - description: - "APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: - "Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object spec: description: WorkflowSpec defines the desired state of Workflow. properties: + bootOptions: + description: BootOptions are options that control the booting of Hardware. + properties: + bootMode: + description: BootMode is the type of booting that will be done. + enum: + - netboot + - iso + type: string + isoURL: + description: |- + ISOURL is the URL of the ISO that will be one-time booted. When this field is set, the controller will create a job.bmc.tinkerbell.org object + for getting the associated hardware into a CDROM booting state. + A HardwareRef that contains a spec.BmcRef must be provided. + format: url + type: string + toggleAllowNetboot: + description: |- + ToggleAllowNetboot indicates whether the controller should toggle the field in the associated hardware for allowing PXE booting. + This will be enabled before a Workflow is executed and disabled after the Workflow has completed successfully. + A HardwareRef must be provided. + type: boolean + type: object hardwareMap: additionalProperties: type: string - description: A mapping of template devices to hadware mac addresses + description: A mapping of template devices to hadware mac addresses. type: object hardwareRef: description: Name of the Hardware associated with this workflow. @@ -62,21 +91,84 @@ spec: type: string type: object status: - description: WorkflowStatus defines the observed state of Workflow. + description: WorkflowStatus defines the observed state of a Workflow. properties: + bootOptions: + description: BootOptions holds the state of any boot options. + properties: + allowNetboot: + description: AllowNetboot holds the state of the the controller's interactions with the allowPXE field in a Hardware object. + properties: + toggledFalse: + type: boolean + toggledTrue: + type: boolean + type: object + jobs: + additionalProperties: + description: JobStatus holds the state of a specific job.bmc.tinkerbell.org object created. + properties: + complete: + description: Complete indicates whether the created job.bmc.tinkerbell.org has reported its conditions as complete. + type: boolean + existingJobDeleted: + description: |- + ExistingJobDeleted indicates whether any existing job.bmc.tinkerbell.org was deleted. + The name of each job.bmc.tinkerbell.org object created by the controller is the same, so only one can exist at a time. + Using the same name was chosen so that there is only ever 1 job.bmc.tinkerbell.org per Hardware/Machine.bmc.tinkerbell.org. + This makes clean up easier and we dont just orphan jobs every time. + type: boolean + uid: + description: |- + UID is the UID of the job.bmc.tinkerbell.org object associated with this workflow. + This is used to uniquely identify the job.bmc.tinkerbell.org object, as + all objects for a specific Hardware/Machine.bmc.tinkerbell.org are created with the same name. + type: string + type: object + description: Jobs holds the state of any job.bmc.tinkerbell.org objects created. + type: object + type: object + conditions: + description: Conditions are the latest available observations of an object's current state. + items: + description: JobCondition describes current state of a job. + properties: + message: + description: Message is a human readable message indicating details about last transition. + type: string + reason: + description: Reason is a (brief) reason for the condition's last transition. + type: string + status: + description: Status of the condition, one of True, False, Unknown. + type: string + time: + description: Time when the condition was created. + format: date-time + type: string + type: + description: Type of job condition, Complete or Failed. + type: string + required: + - status + - type + type: object + type: array + x-kubernetes-list-type: atomic + currentAction: + description: CurrentAction is the action that is currently in the running state. + type: string globalTimeout: - description: GlobalTimeout represents the max execution time + description: GlobalTimeout represents the max execution time. format: int64 type: integer state: - description: State is the state of the workflow in Tinkerbell. + description: State is the current overall state of the Workflow. type: string tasks: - description: Tasks are the tasks to be completed + description: Tasks are the tasks to be run by the worker(s). items: - description: - Task represents a series of actions to be completed - by a worker. + description: Task represents a series of actions to be completed by a worker. properties: actions: items: @@ -133,15 +225,14 @@ spec: - worker type: object type: array + templateRending: + description: |- + TemplateRendering indicates whether the template was rendered successfully. + Possible values are "successful" or "failed" or "unknown". + type: string type: object type: object served: true storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/projects/tinkerbell/tinkerbell-crds/chart/values.yaml b/projects/tinkerbell/tinkerbell-crds/chart/values.yaml index 270fb0a549..8101efb774 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/values.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/values.yaml @@ -125,4 +125,4 @@ kubevip: addr: "" # Port to bind the Prometheus HTTP server to. Defaults to 2113 to avoid colliding with EKS-As # control plane KubeVIP. - port: 2113 + port: 2113 \ No newline at end of file diff --git a/projects/tinkerbell/tinkerbell-crds/helm/sedfile.template b/projects/tinkerbell/tinkerbell-crds/helm/sedfile.template index 70c80dccc0..7de21dca27 100644 --- a/projects/tinkerbell/tinkerbell-crds/helm/sedfile.template +++ b/projects/tinkerbell/tinkerbell-crds/helm/sedfile.template @@ -1 +1 @@ -s,0.2.5,${IMAGE_TAG},g +s,0.2.6,${IMAGE_TAG},g From dad6e214b2e90b6c10c434d9c9d6dc23232609d7 Mon Sep 17 00:00:00 2001 From: Rahul Ganesh Date: Tue, 10 Dec 2024 05:58:32 +0000 Subject: [PATCH 2/3] Revert the checksum for troubleshoot updated in #4043 as the Presubmit fails Signed-off-by: Rahul Ganesh --- projects/replicatedhq/troubleshoot/CHECKSUMS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/replicatedhq/troubleshoot/CHECKSUMS b/projects/replicatedhq/troubleshoot/CHECKSUMS index a359705e68..1f0031c1a2 100644 --- a/projects/replicatedhq/troubleshoot/CHECKSUMS +++ b/projects/replicatedhq/troubleshoot/CHECKSUMS @@ -1,2 +1,2 @@ 4bd7166c2e3dd5077e5e13837338ba8915e8d733e80d341dde484e0608950a8d _output/bin/troubleshoot/linux-amd64/support-bundle -d7603c76ace1fa218abf1a3228748843d82e73ee8f9b1ad3f00020545cd05792 _output/bin/troubleshoot/linux-arm64/support-bundle +3290b26ed7f3f800d3034b97cc5267dd5a57eb1b30ef1e7a57536ac460123201 _output/bin/troubleshoot/linux-arm64/support-bundle From 08be8bb796bf7eeda638fcecd86f16617a00f01e Mon Sep 17 00:00:00 2001 From: Rahul Ganesh Date: Wed, 11 Dec 2024 23:38:25 +0000 Subject: [PATCH 3/3] Update helm resource keep policy annotations and capi move labels on crds Signed-off-by: Rahul Ganesh --- .../chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml | 1 + .../chart/templates/rufio/bmc.tinkerbell.org_machines.yaml | 4 ++++ .../chart/templates/rufio/bmc.tinkerbell.org_tasks.yaml | 1 + .../templates/tink-controller/tinkerbell.org_hardware.yaml | 4 ++++ .../templates/tink-controller/tinkerbell.org_templates.yaml | 4 ++++ .../templates/tink-controller/tinkerbell.org_workflows.yaml | 1 + 6 files changed, 15 insertions(+) diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml index e5b964537e..41a0269c32 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_jobs.yaml @@ -4,6 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 + helm.sh/resource-policy: keep name: jobs.bmc.tinkerbell.org spec: group: bmc.tinkerbell.org diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_machines.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_machines.yaml index 3e49c84b88..c0b2d52e93 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_machines.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_machines.yaml @@ -4,6 +4,10 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 + helm.sh/resource-policy: keep + labels: + clusterctl.cluster.x-k8s.io: "" + clusterctl.cluster.x-k8s.io/move: "" name: machines.bmc.tinkerbell.org spec: group: bmc.tinkerbell.org diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_tasks.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_tasks.yaml index d2bc904fb6..bf69d1ac5d 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_tasks.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/rufio/bmc.tinkerbell.org_tasks.yaml @@ -4,6 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 + helm.sh/resource-policy: keep name: tasks.bmc.tinkerbell.org spec: group: bmc.tinkerbell.org diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_hardware.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_hardware.yaml index a32dcfbf0b..fff0b03d7c 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_hardware.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_hardware.yaml @@ -3,6 +3,10 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.3 + helm.sh/resource-policy: keep + labels: + clusterctl.cluster.x-k8s.io: "" + clusterctl.cluster.x-k8s.io/move: "" name: hardware.tinkerbell.org spec: group: tinkerbell.org diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_templates.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_templates.yaml index 1a7cf72b89..9116f9e968 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_templates.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_templates.yaml @@ -3,6 +3,10 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.3 + helm.sh/resource-policy: keep + labels: + clusterctl.cluster.x-k8s.io: "" + clusterctl.cluster.x-k8s.io/move: "" name: templates.tinkerbell.org spec: group: tinkerbell.org diff --git a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_workflows.yaml b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_workflows.yaml index 2bee793717..4c3f799a41 100644 --- a/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_workflows.yaml +++ b/projects/tinkerbell/tinkerbell-crds/chart/templates/tink-controller/tinkerbell.org_workflows.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.3 + helm.sh/resource-policy: keep name: workflows.tinkerbell.org spec: group: tinkerbell.org