From 9db965863ef655410167f417379d10550bbb4f67 Mon Sep 17 00:00:00 2001 From: Ahree Hong Date: Tue, 16 Apr 2024 13:53:39 -0700 Subject: [PATCH] Bump tink to v0.10.0 --- UPSTREAM_PROJECTS.yaml | 4 +- projects/tinkerbell/tink/ATTRIBUTION.txt | 524 +++++++++--------- projects/tinkerbell/tink/CHECKSUMS | 12 +- projects/tinkerbell/tink/GIT_TAG | 2 +- projects/tinkerbell/tink/GOLANG_VERSION | 2 +- projects/tinkerbell/tink/Makefile | 1 - projects/tinkerbell/tink/README.md | 2 +- .../0001-Remove-.ONESHELL-from-Makefile.patch | 25 + .../0001-Remove-.ONESHELL-from-rules.mk.patch | 26 - .../tinkerbell-chart/chart/Chart.yaml | 2 +- .../templates/tink-server/deployment.yaml | 1 - tools/version-tracker/buildspecs/upgrade.yml | 8 + 12 files changed, 306 insertions(+), 303 deletions(-) create mode 100644 projects/tinkerbell/tink/patches/0001-Remove-.ONESHELL-from-Makefile.patch delete mode 100644 projects/tinkerbell/tink/patches/0001-Remove-.ONESHELL-from-rules.mk.patch diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 90de16ef43..c2da11d7a5 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -285,8 +285,8 @@ projects: go_version: "1.21" - name: tink versions: - - tag: v0.8.0 - go_version: "1.18" + - tag: v0.10.0 + go_version: "1.21" - org: torvalds repos: - name: linux diff --git a/projects/tinkerbell/tink/ATTRIBUTION.txt b/projects/tinkerbell/tink/ATTRIBUTION.txt index f03ec32d3b..64920c04c1 100644 --- a/projects/tinkerbell/tink/ATTRIBUTION.txt +++ b/projects/tinkerbell/tink/ATTRIBUTION.txt @@ -1,45 +1,54 @@ -** github.com/docker/distribution; version v2.8.1+incompatible -- +** github.com/distribution/reference; version v0.5.0 -- +https://github.com/distribution/reference + +** github.com/docker/distribution/reference; version v2.8.3+incompatible -- https://github.com/distribution/distribution -** github.com/docker/docker; version v20.10.17+incompatible -- +** github.com/docker/docker; version v24.0.7+incompatible -- https://github.com/moby/moby ** github.com/docker/go-connections; version v0.4.0 -- https://github.com/docker/go-connections -** github.com/docker/go-units; version v0.4.0 -- +** github.com/docker/go-units; version v0.5.0 -- https://github.com/docker/go-units -** github.com/equinix-labs/otel-init-go/otelinit; version v0.0.1 -- +** 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.2.3 -- +** github.com/go-logr/logr; version v1.4.1 -- 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.2.0 -- +** github.com/go-logr/zapr; version v1.3.0 -- https://github.com/go-logr/zapr +** github.com/go-openapi/jsonpointer; version v0.19.6 -- +https://github.com/go-openapi/jsonpointer + +** github.com/go-openapi/jsonreference; version v0.20.2 -- +https://github.com/go-openapi/jsonreference + +** github.com/go-openapi/swag; version v0.22.3 -- +https://github.com/go-openapi/swag + ** github.com/golang/groupcache/lru; version v0.0.0-20210331224755-41bb18bfe9da -- https://github.com/golang/groupcache +** github.com/google/gnostic-models; version v0.6.8 -- +https://github.com/google/gnostic-models + ** github.com/google/gofuzz; version v1.2.0 -- https://github.com/google/gofuzz -** github.com/googleapis/gnostic; version v0.5.5 -- -https://github.com/google/gnostic - -** github.com/grpc-ecosystem/go-grpc-middleware; version v1.3.0 -- -https://github.com/grpc-ecosystem/go-grpc-middleware - ** github.com/grpc-ecosystem/go-grpc-prometheus; version v1.2.0 -- https://github.com/grpc-ecosystem/go-grpc-prometheus -** github.com/matttproud/golang_protobuf_extensions/pbutil; version v1.0.2-0.20181231171920-c182affec369 -- -https://github.com/matttproud/golang_protobuf_extensions +** github.com/matttproud/golang_protobuf_extensions/v2/pbutil; version v2.0.0 -- +https://github.com/matttproud/golang_protobuf_extensions/v2 ** github.com/modern-go/concurrent; version v0.0.0-20180306012644-bacd9c7ef1dd -- https://github.com/modern-go/concurrent @@ -50,111 +59,117 @@ https://github.com/modern-go/reflect2 ** github.com/opencontainers/go-digest; version v1.0.0 -- https://github.com/opencontainers/go-digest -** github.com/opencontainers/image-spec/specs-go; version v1.0.3-0.20211202183452-c5a74bcca799 -- +** github.com/opencontainers/image-spec/specs-go; version v1.1.0-rc5 -- https://github.com/opencontainers/image-spec -** github.com/packethost/pkg; version v0.0.0-20200903155310-0433e0605550 -- -https://github.com/packethost/pkg - -** github.com/pelletier/go-toml; version v1.9.4 -- -https://github.com/pelletier/go-toml - -** github.com/prometheus/client_golang/prometheus; version v1.12.1 -- +** github.com/prometheus/client_golang/prometheus; version v1.18.0 -- https://github.com/prometheus/client_golang -** github.com/prometheus/client_model/go; version v0.2.0 -- +** github.com/prometheus/client_model/go; version v0.5.0 -- https://github.com/prometheus/client_model -** github.com/prometheus/common; version v0.32.1 -- +** github.com/prometheus/common; version v0.45.0 -- https://github.com/prometheus/common -** github.com/prometheus/procfs; version v0.7.3 -- +** github.com/prometheus/procfs; version v0.12.0 -- https://github.com/prometheus/procfs -** github.com/spf13/afero; version v1.6.0 -- +** github.com/spf13/afero; version v1.11.0 -- https://github.com/spf13/afero -** github.com/spf13/cobra; version v1.5.0 -- +** github.com/spf13/cobra; version v1.8.0 -- https://github.com/spf13/cobra -** github.com/tinkerbell/tink; version v0.8.0 -- +** github.com/tinkerbell/tink; version v0.10.0 -- https://github.com/tinkerbell/tink -** go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc; version v0.34.0 -- +** go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc; version v0.47.0 -- https://github.com/open-telemetry/opentelemetry-go-contrib -** go.opentelemetry.io/otel; version v1.9.0 -- +** go.opentelemetry.io/otel; version v1.22.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/internal/retry; version v1.4.1 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.19.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.4.1 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.19.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.4.1 -- +** go.opentelemetry.io/otel/metric; version v1.22.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/sdk; version v1.4.1 -- +** go.opentelemetry.io/otel/sdk; version v1.21.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/trace; version v1.9.0 -- +** go.opentelemetry.io/otel/trace; version v1.22.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/proto/otlp; version v0.12.0 -- +** go.opentelemetry.io/proto/otlp; version v1.0.0 -- https://github.com/open-telemetry/opentelemetry-proto-go -** gomodules.xyz/jsonpatch/v2; version v2.2.0 -- +** gomodules.xyz/jsonpatch/v2; version v2.4.0 -- https://github.com/gomodules/jsonpatch -** google.golang.org/genproto; version v0.0.0-20211208223120-3a66f561d7aa -- +** google.golang.org/genproto/googleapis/api/httpbody; version v0.0.0-20231106174013-bbf56f31fb17 -- +https://github.com/googleapis/go-genproto + +** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20231120223509-83a465c0220f -- https://github.com/googleapis/go-genproto -** google.golang.org/grpc; version v1.48.0 -- +** google.golang.org/grpc; version v1.60.1 -- https://github.com/grpc/grpc-go -** gopkg.in/ini.v1; version v1.62.0 -- +** gopkg.in/ini.v1; version v1.67.0 -- https://gopkg.in/ini.v1 ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** k8s.io/api; version v0.23.0 -- +** k8s.io/api; version v0.29.1 -- https://github.com/kubernetes/api -** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.23.0 -- +** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.29.0 -- https://github.com/kubernetes/apiextensions-apiserver -** k8s.io/apimachinery/pkg; version v0.23.0 -- +** k8s.io/apimachinery/pkg; version v0.29.1 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go; version v0.23.0 -- +** k8s.io/client-go; version v0.29.1 -- https://github.com/kubernetes/client-go -** k8s.io/component-base/config; version v0.23.0 -- +** k8s.io/component-base/config; version v0.29.0 -- https://github.com/kubernetes/component-base -** k8s.io/klog/v2; version v2.60.1 -- +** k8s.io/klog/v2; version v2.110.1 -- https://github.com/kubernetes/klog -** k8s.io/kube-openapi/pkg; version v0.0.0-20211115234752-e816edb12b65 -- +** k8s.io/kube-openapi/pkg; version v0.0.0-20231010175941-2dd684a91f00 -- +https://github.com/kubernetes/kube-openapi + +** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20231010175941-2dd684a91f00 -- https://github.com/kubernetes/kube-openapi -** k8s.io/utils; version v0.0.0-20210930125809-cb0fa318a74b -- +** k8s.io/utils; version v0.0.0-20230726121419-3b25d923346b -- https://github.com/kubernetes/utils -** knative.dev/pkg; version v0.0.0-20211119170723-a99300deff34 -- +** knative.dev/pkg/ptr; version v0.0.0-20211119170723-a99300deff34 -- https://github.com/knative/pkg -** sigs.k8s.io/controller-runtime; version v0.11.1 -- +** sigs.k8s.io/controller-runtime; version v0.17.0 -- https://github.com/kubernetes-sigs/controller-runtime -** sigs.k8s.io/json; version v0.0.0-20211020170558-c049b76a60c6 -- +** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- https://github.com/kubernetes-sigs/json -** sigs.k8s.io/structured-merge-diff/v4; version v4.2.0 -- +** sigs.k8s.io/structured-merge-diff/v4; version v4.4.1 -- https://github.com/kubernetes-sigs/structured-merge-diff +** sigs.k8s.io/yaml; version v1.4.0 -- +https://github.com/kubernetes-sigs/yaml + +** sigs.k8s.io/yaml/goyaml.v2; version v1.4.0 -- +https://github.com/kubernetes-sigs/yaml + Apache License Version 2.0, January 2004 @@ -381,7 +396,7 @@ For more information, please see https://www.bis.doc.gov See also https://www.apache.org/dev/crypto.html and/or seek legal counsel. -* For github.com/matttproud/golang_protobuf_extensions/pbutil see also this required NOTICE: +* For github.com/matttproud/golang_protobuf_extensions/v2/pbutil see also this required NOTICE: Copyright 2012 Matt T. Proud (matt.proud@gmail.com) @@ -452,9 +467,25 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +* For sigs.k8s.io/yaml/goyaml.v2 see also this required NOTICE: +Copyright 2011-2016 Canonical Ltd. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + ------ -** github.com/magiconair/properties; version v1.8.5 -- +** github.com/magiconair/properties; version v1.8.7 -- https://github.com/magiconair/properties Copyright (c) 2013-2020, Frank Schroeder @@ -513,8 +544,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/evanphx/json-patch; version v4.12.0+incompatible -- -https://github.com/evanphx/json-patch +** github.com/evanphx/json-patch/v5; version v5.8.0 -- +https://github.com/evanphx/json-patch/v5 Copyright (c) 2014, Evan Phoenix All rights reserved. @@ -544,37 +575,34 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/fsnotify/fsnotify; version v1.5.1 -- +** github.com/fsnotify/fsnotify; version v1.7.0 -- https://github.com/fsnotify/fsnotify -Copyright (c) 2012 The Go Authors. All rights reserved. -Copyright (c) 2012-2019 fsnotify Authors. All rights reserved. +Copyright © 2012 The Go Authors. All rights reserved. +Copyright © fsnotify 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: +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. +* 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. +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. ------ @@ -619,7 +647,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/golang/protobuf; version v1.5.2 -- +** github.com/golang/protobuf; version v1.5.3 -- https://github.com/golang/protobuf Copyright 2010 The Go Authors. All rights reserved. @@ -653,7 +681,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/google/go-cmp/cmp; version v0.5.8 -- +** github.com/google/go-cmp/cmp; version v0.6.0 -- https://github.com/google/go-cmp Copyright (c) 2017 The Go Authors. All rights reserved. @@ -686,7 +714,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/google/uuid; version v1.3.0 -- +** github.com/google/uuid; version v1.4.0 -- https://github.com/google/uuid Copyright (c) 2009,2014 Google Inc. All rights reserved. @@ -719,8 +747,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/grpc-ecosystem/grpc-gateway; version v1.16.0 -- -https://github.com/grpc-ecosystem/grpc-gateway +** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.18.0 -- +https://github.com/grpc-ecosystem/grpc-gateway/v2 Copyright (c) 2015, Gengo, Inc. All rights reserved. @@ -786,8 +814,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.32.1 -- -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. @@ -820,64 +848,73 @@ 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 -- -https://github.com/spf13/pflag +** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.45.0 -- +https://github.com/prometheus/common -Copyright (c) 2012 Alex Ogier. All rights reserved. -Copyright (c) 2012 The Go Authors. All rights reserved. +Copyright (c) 2011, Open Knowledge Foundation Ltd. +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. + 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. 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, +HOLDER 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/go; version go1.18.10 -- +** github.com/sagikazarmark/slog-shim; version v0.1.0 -- +https://github.com/sagikazarmark/slog-shim + +** golang.org/go; version go1.21.8 -- https://github.com/golang/go -** golang.org/x/net; version v0.0.0-20220812174116-3211cb980234 -- +** golang.org/x/exp/maps; version v0.0.0-20230905200255-921286631fa9 -- +https://golang.org/x/exp + +** golang.org/x/net; version v0.20.0 -- https://golang.org/x/net -** golang.org/x/oauth2; version v0.0.0-20211028175245-ba495a64dcb5 -- +** golang.org/x/oauth2; version v0.15.0 -- https://golang.org/x/oauth2 -** golang.org/x/sys; version v0.0.0-20220818161305-2296e01440c6 -- +** golang.org/x/sys/unix; version v0.16.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.0.0-20220722155259-a9ba230a4035 -- +** golang.org/x/term; version v0.16.0 -- https://golang.org/x/term -** golang.org/x/text; version v0.3.7 -- +** golang.org/x/text; version v0.14.0 -- https://golang.org/x/text -** golang.org/x/time/rate; version v0.0.0-20210723032227-1f47c861a9ac -- +** golang.org/x/time/rate; version v0.5.0 -- https://golang.org/x/time -** k8s.io/apimachinery/third_party/forked/golang; version v0.23.0 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.29.1 -- https://github.com/kubernetes/apimachinery Copyright (c) 2009 The Go Authors. All rights reserved. @@ -910,7 +947,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.28.1 -- +** github.com/spf13/pflag; version v1.0.5 -- +https://github.com/spf13/pflag + +Copyright (c) 2012 Alex Ogier. All rights reserved. +Copyright (c) 2012 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. + +------ + +** google.golang.org/protobuf; version v1.32.0 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -977,10 +1048,10 @@ 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-20210930125809-cb0fa318a74b -- -https://github.com/kubernetes/utils +** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20231010175941-2dd684a91f00 -- +https://github.com/kubernetes/kube-openapi -Copyright (c) 2012 The Go Authors. All rights reserved. +Copyright (c) 2020 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 @@ -1010,28 +1081,40 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/blendle/zapdriver; version v1.3.1 -- -https://github.com/blendle/zapdriver +** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20230726121419-3b25d923346b -- +https://github.com/kubernetes/utils -ISC License +Copyright (c) 2012 The Go Authors. All rights reserved. -Copyright (c) Blendle +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. + * 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. -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +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/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 @@ -1052,75 +1135,85 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ------ -** github.com/benbjohnson/clock; version v1.3.0 -- -https://github.com/benbjohnson/clock -Copyright (c) 2014 Ben Johnson - ** github.com/beorn7/perks/quantile; version v1.0.1 -- https://github.com/beorn7/perks Copyright (C) 2013 Blake Mizerany -** github.com/cenkalti/backoff/v4; version v4.1.2 -- +** github.com/cenkalti/backoff/v4; version v4.2.1 -- https://github.com/cenkalti/backoff/v4 Copyright (c) 2014 Cenk Altı -** github.com/cespare/xxhash/v2; version v2.1.2 -- +** github.com/cespare/xxhash/v2; version v2.2.0 -- https://github.com/cespare/xxhash/v2 Copyright (c) 2016 Caleb Spare +** github.com/emicklei/go-restful/v3; version v3.11.0 -- +https://github.com/emicklei/go-restful/v3 +Copyright (c) 2012,2013 Ernest Micklei + +** github.com/josharian/intern; version v1.0.0 -- +https://github.com/josharian/intern +Copyright (c) 2019 Josh Bleecher Snyder + ** github.com/json-iterator/go; version v1.1.12 -- https://github.com/json-iterator/go Copyright (c) 2016 json-iterator -** github.com/mitchellh/mapstructure; version v1.4.1 -- +** github.com/mailru/easyjson; version v0.7.7 -- +https://github.com/mailru/easyjson +Copyright (c) 2016 Mail.Ru Group + +** github.com/mitchellh/mapstructure; version v1.5.0 -- https://github.com/mitchellh/mapstructure Copyright (c) 2013 Mitchell Hashimoto -** github.com/rollbar/rollbar-go; version v1.0.2 -- -https://github.com/rollbar/rollbar-go -Copyright (c) 2018 Rollbar, Inc. - -** github.com/rubenv/sql-migrate; version v0.0.0-20200616145509-8d140a17f351 -- -https://github.com/rubenv/sql-migrate -Copyright (C) 2014-2019 by Ruben Vermeersch - -** github.com/rubenv/sql-migrate/sqlparse; version v0.0.0-20200616145509-8d140a17f351 -- -https://github.com/rubenv/sql-migrate -Copyright (C) 2014-2017 by Ruben Vermeersch -Copyright (C) 2012-2014 by Liam Staskawicz - -** github.com/sirupsen/logrus; version v1.9.0 -- -https://github.com/sirupsen/logrus -Copyright (c) 2014 Simon Eskildsen - -** github.com/spf13/cast; version v1.3.1 -- +** github.com/spf13/cast; version v1.6.0 -- https://github.com/spf13/cast Copyright (c) 2014 Steve Francia -** github.com/spf13/jwalterweatherman; version v1.1.0 -- -https://github.com/spf13/jwalterweatherman -Copyright (c) 2014 Steve Francia - -** github.com/spf13/viper; version v1.8.1 -- +** github.com/spf13/viper; version v1.18.2 -- https://github.com/spf13/viper Copyright (c) 2014 Steve Francia -** github.com/subosito/gotenv; version v1.2.0 -- +** github.com/subosito/gotenv; version v1.6.0 -- https://github.com/subosito/gotenv Copyright (c) 2013 Alif Rachmawadi -** go.uber.org/atomic; version v1.10.0 -- -https://github.com/uber-go/atomic -Copyright (c) 2016 Uber Technologies, Inc. - -** go.uber.org/multierr; version v1.8.0 -- +** 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.22.0 -- +** go.uber.org/zap; version v1.26.0 -- https://github.com/uber-go/zap Copyright (c) 2016-2017 Uber Technologies, Inc. +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 +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +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 -- +https://github.com/pelletier/go-toml/v2 +Copyright (c) 2021 - 2023 Thomas Pelletier + +go-toml v2 + + 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 without limitation the rights @@ -1140,48 +1233,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** github.com/lib/pq; version v1.10.1 -- -https://github.com/lib/pq -Copyright (c) 2011-2013, 'pq' Contributors -Copyright (C) 2011 Blake Mizerany - -Portions - -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 without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------- - -** gopkg.in/gorp.v1; version v1.7.2 -- -https://gopkg.in/gorp.v1 -Copyright (c) 2012 James Cooper - -( - - - -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 -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------- - ** gopkg.in/yaml.v3; version v3.0.1 -- https://gopkg.in/yaml.v3 Copyright (c) 2006-2010 Kirill Simonov @@ -1255,59 +1306,6 @@ limitations under the License. ------ -** sigs.k8s.io/yaml; version v1.3.0 -- -https://github.com/kubernetes-sigs/yaml -Copyright (c) 2014 Sam Ghods -Copyright (c) 2012 The Go Authors. All rights reserved. - -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 without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - - - -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/hashicorp/hcl; version v1.0.0 -- https://github.com/hashicorp/hcl diff --git a/projects/tinkerbell/tink/CHECKSUMS b/projects/tinkerbell/tink/CHECKSUMS index 6a5504269c..e513dbd1b2 100644 --- a/projects/tinkerbell/tink/CHECKSUMS +++ b/projects/tinkerbell/tink/CHECKSUMS @@ -1,6 +1,6 @@ -3893559a553a18127be05e43b0bfd368e851ab1340780857fb65b47d4755be06 _output/bin/tink/linux-amd64/tink-controller -df2796a3e795a8fce5c8fef21836e08eafdac30f07c91942f48c6d76d49371b8 _output/bin/tink/linux-amd64/tink-server -9a27167b56c9427535f4f03c334c549eec2659097d068fb47a3adac6631d7954 _output/bin/tink/linux-amd64/tink-worker -bd0bc8d8057d3de7a3313800b148a4dda808108d491ea2f7ff474476c628155d _output/bin/tink/linux-arm64/tink-controller -3c0ae4230ab42acdd86b27b8289648216060f04bc428d86fa28853076c924842 _output/bin/tink/linux-arm64/tink-server -51b571956a06aeecbfd6de67022812455e9e6deee68800773c24d79c6c8913b5 _output/bin/tink/linux-arm64/tink-worker +76c006fd763dd3679972e222bf9c0780a6357c8b577315488eb5474b725aee9c _output/bin/tink/linux-amd64/tink-controller +514c41c24f0e40061efd4f45e3a5fce6195d3b26021425b2e3351ce723370363 _output/bin/tink/linux-amd64/tink-server +c2435808b2b38ad2a145f8db3dacdac4a7ab57f68eff3282e1dfac0d692d47bc _output/bin/tink/linux-amd64/tink-worker +4777d0715eb327a3e6875b5baf6a3aff487c5a6ea38c970b066cfbd5616d7eb1 _output/bin/tink/linux-arm64/tink-controller +871f8eff4a1ab04de296aee1d5243f207ad2ce517c4990ca2e3dc82180fc437c _output/bin/tink/linux-arm64/tink-server +e222fc18bfd495f568779f6d685b1c7a1bf68137b22a9510b04e2b0fa77c433f _output/bin/tink/linux-arm64/tink-worker diff --git a/projects/tinkerbell/tink/GIT_TAG b/projects/tinkerbell/tink/GIT_TAG index 4ea5cafac8..f78dc36529 100644 --- a/projects/tinkerbell/tink/GIT_TAG +++ b/projects/tinkerbell/tink/GIT_TAG @@ -1 +1 @@ -v0.8.0 \ No newline at end of file +v0.10.0 \ No newline at end of file diff --git a/projects/tinkerbell/tink/GOLANG_VERSION b/projects/tinkerbell/tink/GOLANG_VERSION index adc97d8e22..d2ab029d32 100644 --- a/projects/tinkerbell/tink/GOLANG_VERSION +++ b/projects/tinkerbell/tink/GOLANG_VERSION @@ -1 +1 @@ -1.18 +1.21 diff --git a/projects/tinkerbell/tink/Makefile b/projects/tinkerbell/tink/Makefile index 3649997fe3..b26eca4582 100644 --- a/projects/tinkerbell/tink/Makefile +++ b/projects/tinkerbell/tink/Makefile @@ -22,7 +22,6 @@ VERSION?=$(shell git -C $(REPO) rev-parse --short HEAD) EXTRA_GO_LDFLAGS=-X main.version=$(VERSION) HAS_S3_ARTIFACTS=true -EXCLUDE_FROM_UPGRADE_BUILDSPEC=true include $(BASE_DIRECTORY)/Common.mk diff --git a/projects/tinkerbell/tink/README.md b/projects/tinkerbell/tink/README.md index 3e583c4440..0c63ca8dfb 100644 --- a/projects/tinkerbell/tink/README.md +++ b/projects/tinkerbell/tink/README.md @@ -1,5 +1,5 @@ ## **Tink** -![Version](https://img.shields.io/badge/version-v0.8.0-blue) +![Version](https://img.shields.io/badge/version-v0.10.0-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUmxrMmd4b2N6dk02TDRPVlVXQ1N3aEhsRzAxWFBtZ1Y1VVNXWEtVZlVNS0tkQlZ4MHFuNXJiWld0ZFMvVzVmMzZxWjhKK3FERWdQeEV6RWd6WFZBcGM0PSIsIml2UGFyYW1ldGVyU3BlYyI6ImEvZEhCemJsQXJWZXVmc2kiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [Tink](https://github.com/tinkerbell/tink) consists of the tink-server, tink-controller and tink-worker. The tink-worker and tink-server communicate over gRPC, and are responsible for processing workflows. Tink-controller is Kubernetes controller that is responsible for reconciling Tinkerbell hardwares, templates and workflows. The CLI is the user-interactive piece for creating workflows and their building blocks, templates and hardware data. diff --git a/projects/tinkerbell/tink/patches/0001-Remove-.ONESHELL-from-Makefile.patch b/projects/tinkerbell/tink/patches/0001-Remove-.ONESHELL-from-Makefile.patch new file mode 100644 index 0000000000..a161dd017c --- /dev/null +++ b/projects/tinkerbell/tink/patches/0001-Remove-.ONESHELL-from-Makefile.patch @@ -0,0 +1,25 @@ +From c876def043d2039ba2ad4bb40076e0404dec6fb4 Mon Sep 17 00:00:00 2001 +From: Ahree Hong +Date: Tue, 16 Apr 2024 13:52:26 -0700 +Subject: [PATCH] Remove .ONESHELL from Makefile + +Signed-off-by: Ahree Hong +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index b29fe5c..1e07f9d 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,6 @@ PATH := $(PATH):$(PWD)/bin + # Use bash instead of plain sh and treat the shell as one shell script invocation. + SHELL := bash + .SHELLFLAGS := -o pipefail -euc +-.ONESHELL: + + # Second expansion is used by the image targets to depend on their respective binaries. It is + # necessary because automatic variables are not set on first expansion. +-- +2.40.0 + diff --git a/projects/tinkerbell/tink/patches/0001-Remove-.ONESHELL-from-rules.mk.patch b/projects/tinkerbell/tink/patches/0001-Remove-.ONESHELL-from-rules.mk.patch deleted file mode 100644 index 4eb2c3a608..0000000000 --- a/projects/tinkerbell/tink/patches/0001-Remove-.ONESHELL-from-rules.mk.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2972a803251a18e87ce92676cbac0aa079b32017 Mon Sep 17 00:00:00 2001 -From: Abhinav Pandey -Date: Tue, 3 May 2022 11:38:23 -0700 -Subject: [PATCH] Remove .ONESHELL from rules.mk - -Signed-off-by: Abhinav Pandey ---- - rules.mk | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/rules.mk b/rules.mk -index a881c42..027f521 100644 ---- a/rules.mk -+++ b/rules.mk -@@ -5,8 +5,6 @@ MAKEFLAGS += --no-builtin-rules - # This avoids a failure to then skip building on next run if the output is created by shell redirection for example - # Not really necessary for now, but just good to have already if it becomes necessary later. - .DELETE_ON_ERROR: --# Treat the whole recipe as a one shell script/invocation instead of one-per-line --.ONESHELL: - # Use bash instead of plain sh - SHELL := bash - .SHELLFLAGS := -o pipefail -euc --- -2.30.1 (Apple Git-130) - diff --git a/projects/tinkerbell/tinkerbell-chart/chart/Chart.yaml b/projects/tinkerbell/tinkerbell-chart/chart/Chart.yaml index 5ef9178914..ba9c7e8352 100644 --- a/projects/tinkerbell/tinkerbell-chart/chart/Chart.yaml +++ b/projects/tinkerbell/tinkerbell-chart/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.4 +version: 0.2.5 # 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-chart/chart/templates/tink-server/deployment.yaml b/projects/tinkerbell/tinkerbell-chart/chart/templates/tink-server/deployment.yaml index 612d8f0270..8a482ebe5d 100644 --- a/projects/tinkerbell/tinkerbell-chart/chart/templates/tink-server/deployment.yaml +++ b/projects/tinkerbell/tinkerbell-chart/chart/templates/tink-server/deployment.yaml @@ -19,7 +19,6 @@ spec: containers: - args: - --backend=kubernetes - - --tls=false {{- range .Values.tinkServer.args }} - {{ . }} {{- end }} diff --git a/tools/version-tracker/buildspecs/upgrade.yml b/tools/version-tracker/buildspecs/upgrade.yml index ee428e80e8..363a2cd2bc 100644 --- a/tools/version-tracker/buildspecs/upgrade.yml +++ b/tools/version-tracker/buildspecs/upgrade.yml @@ -514,6 +514,13 @@ batch: variables: PROJECT_PATH: projects/tinkerbell/rufio CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio + - identifier: tinkerbell_tink + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/tinkerbell/tink + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.tink - identifier: vmware_govmomi env: type: ARM_CONTAINER @@ -590,6 +597,7 @@ batch: - replicatedhq_troubleshoot - tinkerbell_hegel - tinkerbell_rufio + - tinkerbell_tink - vmware_govmomi version: 0.2 env: