From 5e1548a77bb6e39311a18ce7a7a931d39af406c0 Mon Sep 17 00:00:00 2001 From: Ahree Hong Date: Mon, 15 Apr 2024 15:19:25 -0700 Subject: [PATCH] Bump rufio to v0.3.3 --- UPSTREAM_PROJECTS.yaml | 4 +- projects/tinkerbell/rufio/ATTRIBUTION.txt | 111 +++++++++++------- projects/tinkerbell/rufio/CHECKSUMS | 4 +- projects/tinkerbell/rufio/GIT_TAG | 2 +- projects/tinkerbell/rufio/GOLANG_VERSION | 2 +- projects/tinkerbell/rufio/Makefile | 1 - projects/tinkerbell/rufio/README.md | 2 +- tools/version-tracker/buildspecs/upgrade.yml | 8 ++ .../pkg/constants/constants.go | 4 + 9 files changed, 86 insertions(+), 52 deletions(-) diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 800ce1ab03..90de16ef43 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -281,8 +281,8 @@ projects: go_version: "1.17" - name: rufio versions: - - commit: afd7cd82fa08dae8f9f3ffac96eb030176f3abbd - go_version: "1.20" + - tag: v0.3.3 + go_version: "1.21" - name: tink versions: - tag: v0.8.0 diff --git a/projects/tinkerbell/rufio/ATTRIBUTION.txt b/projects/tinkerbell/rufio/ATTRIBUTION.txt index fffe61fb00..06a1348072 100644 --- a/projects/tinkerbell/rufio/ATTRIBUTION.txt +++ b/projects/tinkerbell/rufio/ATTRIBUTION.txt @@ -1,11 +1,11 @@ -** github.com/bmc-toolbox/bmclib/v2; version v2.1.1-0.20231017114451-153e11d62a71 -- +** github.com/bmc-toolbox/bmclib/v2; version v2.2.0 -- https://github.com/bmc-toolbox/bmclib/v2 -** github.com/bmc-toolbox/common; version v0.0.0-20230220061748-93ff001f4a1d -- +** github.com/bmc-toolbox/common; version v0.0.0-20230717121556-5eb9915a8a5a -- https://github.com/bmc-toolbox/common -** github.com/go-logr/logr; version v1.2.4 -- +** github.com/go-logr/logr; version v1.4.1 -- https://github.com/go-logr/logr ** github.com/go-logr/zerologr; version v1.2.3 -- @@ -35,8 +35,8 @@ https://github.com/jacobweinstock/iamt ** github.com/jacobweinstock/registrar; version v0.4.7 -- https://github.com/jacobweinstock/registrar -** github.com/matttproud/golang_protobuf_extensions/pbutil; version v1.0.4 -- -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 @@ -47,19 +47,19 @@ 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.16.0 -- +** github.com/prometheus/client_golang/prometheus; version v1.18.0 -- https://github.com/prometheus/client_golang -** github.com/prometheus/client_model/go; version v0.4.0 -- +** github.com/prometheus/client_model/go; version v0.5.0 -- https://github.com/prometheus/client_model -** github.com/prometheus/common; version v0.44.0 -- +** github.com/prometheus/common; version v0.45.0 -- https://github.com/prometheus/common -** github.com/prometheus/procfs; version v0.10.1 -- +** github.com/prometheus/procfs; version v0.12.0 -- https://github.com/prometheus/procfs -** github.com/tinkerbell/rufio; version afd7cd82fa08dae8f9f3ffac96eb030176f3abbd -- +** github.com/tinkerbell/rufio; version v0.3.3 -- https://github.com/tinkerbell/rufio ** github.com/VictorLowther/simplexml; version v0.0.0-20180716164440-0bff93621230 -- @@ -68,48 +68,60 @@ https://github.com/VictorLowther/simplexml ** github.com/VictorLowther/soap; version v0.0.0-20150314151524-8e36fca84b22 -- https://github.com/VictorLowther/soap +** go.opentelemetry.io/otel; version v1.20.0 -- +https://github.com/open-telemetry/opentelemetry-go + +** go.opentelemetry.io/otel/trace; version v1.20.0 -- +https://github.com/open-telemetry/opentelemetry-go + ** gomodules.xyz/jsonpatch/v2; version v2.4.0 -- https://github.com/gomodules/jsonpatch ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** k8s.io/api; version v0.28.2 -- +** k8s.io/api; version v0.29.0 -- https://github.com/kubernetes/api -** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.28.0 -- +** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.29.0 -- https://github.com/kubernetes/apiextensions-apiserver -** k8s.io/apimachinery/pkg; version v0.28.2 -- +** k8s.io/apimachinery/pkg; version v0.29.0 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go; version v0.28.2 -- +** k8s.io/client-go; version v0.29.0 -- https://github.com/kubernetes/client-go -** k8s.io/component-base/config; version v0.28.1 -- +** k8s.io/component-base/config; version v0.29.0 -- https://github.com/kubernetes/component-base -** k8s.io/klog/v2; version v2.100.1 -- +** k8s.io/klog/v2; version v2.110.1 -- https://github.com/kubernetes/klog -** k8s.io/kube-openapi/pkg; version v0.0.0-20230717233707-2695361300d9 -- +** 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-20230717233707-2695361300d9 -- +** 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-20230406110748-d93618cff8a2 -- +** k8s.io/utils; version v0.0.0-20230726121419-3b25d923346b -- https://github.com/kubernetes/utils -** sigs.k8s.io/controller-runtime; version v0.16.2 -- +** sigs.k8s.io/controller-runtime; version v0.17.0 -- https://github.com/kubernetes-sigs/controller-runtime ** 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.3 -- +** 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 @@ -314,7 +326,7 @@ https://github.com/kubernetes-sigs/structured-merge-diff limitations under the License. -* 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) @@ -385,6 +397,22 @@ 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/pkg/errors; version v0.9.1 -- @@ -453,7 +481,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/evanphx/json-patch/v5; version v5.6.0 -- +** github.com/evanphx/json-patch/v5; version v5.8.0 -- https://github.com/evanphx/json-patch/v5 Copyright (c) 2014, Evan Phoenix @@ -484,7 +512,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/fsnotify/fsnotify; version v1.6.0 -- +** github.com/fsnotify/fsnotify; version v1.7.0 -- https://github.com/fsnotify/fsnotify Copyright © 2012 The Go Authors. All rights reserved. @@ -693,7 +721,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.44.0 -- +** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.45.0 -- https://github.com/prometheus/common Copyright (c) 2011, Open Knowledge Foundation Ltd. @@ -763,7 +791,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/stmcginnis/gofish; version v0.14.1-0.20230920133920-77490fd98fa2 -- +** github.com/stmcginnis/gofish; version v0.15.1-0.20231121142100-22a60a77be91 -- https://github.com/stmcginnis/gofish BSD 3-Clause License @@ -797,31 +825,31 @@ 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.20.14 -- +** golang.org/go; version go1.21.8 -- https://github.com/golang/go -** golang.org/x/exp; version v0.0.0-20230127130021-4ca2cb1a16b7 -- +** golang.org/x/exp; version v0.0.0-20231110203233-9a3e6036ecaa -- https://golang.org/x/exp -** golang.org/x/net; version v0.17.0 -- +** golang.org/x/net; version v0.20.0 -- https://golang.org/x/net -** golang.org/x/oauth2; version v0.8.0 -- +** golang.org/x/oauth2; version v0.12.0 -- https://golang.org/x/oauth2 -** golang.org/x/sys/unix; version v0.13.0 -- +** golang.org/x/sys/unix; version v0.16.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.13.0 -- +** golang.org/x/term; version v0.16.0 -- https://golang.org/x/term -** golang.org/x/text; version v0.13.0 -- +** golang.org/x/text; version v0.14.0 -- https://golang.org/x/text ** golang.org/x/time/rate; version v0.3.0 -- https://golang.org/x/time -** k8s.io/apimachinery/third_party/forked/golang; version v0.28.2 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.29.0 -- https://github.com/kubernetes/apimachinery Copyright (c) 2009 The Go Authors. All rights reserved. @@ -854,7 +882,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.30.0 -- +** google.golang.org/protobuf; version v1.31.0 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -921,7 +949,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-20230717233707-2695361300d9 -- +** 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) 2020 The Go Authors. All rights reserved. @@ -954,7 +982,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-20230406110748-d93618cff8a2 -- +** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20230726121419-3b25d923346b -- https://github.com/kubernetes/utils Copyright (c) 2012 The Go Authors. All rights reserved. @@ -1016,7 +1044,7 @@ Copyright (C) 2013 Blake Mizerany https://github.com/cespare/xxhash/v2 Copyright (c) 2016 Caleb Spare -** github.com/emicklei/go-restful/v3; version v3.9.0 -- +** github.com/emicklei/go-restful/v3; version v3.11.0 -- https://github.com/emicklei/go-restful/v3 Copyright (c) 2012,2013 Ernest Micklei @@ -1044,7 +1072,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 @@ -1081,11 +1109,6 @@ https://github.com/ghodss/yaml Copyright (c) 2014 Sam Ghods Copyright (c) 2012 The Go Authors. All rights reserved. -** 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 diff --git a/projects/tinkerbell/rufio/CHECKSUMS b/projects/tinkerbell/rufio/CHECKSUMS index eb83b93fb6..1bfc8eb6c7 100644 --- a/projects/tinkerbell/rufio/CHECKSUMS +++ b/projects/tinkerbell/rufio/CHECKSUMS @@ -1,2 +1,2 @@ -af68ae859c9ccdc2ccc640b873c647715e2952132b2f0275892ff59c3c6ebdf7 _output/bin/rufio/linux-amd64/manager -5f6cd226de9c4c4132cdbb3360ee804c2abe142a3cde68fbf3bb078b55f4bded _output/bin/rufio/linux-arm64/manager +908805fbc92aec1f415e5e661fa2f2ada9aed6478bcf03540916de3759b340db _output/bin/rufio/linux-amd64/manager +263b2b70369b156cb0af1122d5acc1176a548a9aa2cb6a4df7135091bb9db14f _output/bin/rufio/linux-arm64/manager diff --git a/projects/tinkerbell/rufio/GIT_TAG b/projects/tinkerbell/rufio/GIT_TAG index 77e839b9c4..ed3ee48591 100644 --- a/projects/tinkerbell/rufio/GIT_TAG +++ b/projects/tinkerbell/rufio/GIT_TAG @@ -1 +1 @@ -afd7cd82fa08dae8f9f3ffac96eb030176f3abbd \ No newline at end of file +v0.3.3 \ No newline at end of file diff --git a/projects/tinkerbell/rufio/GOLANG_VERSION b/projects/tinkerbell/rufio/GOLANG_VERSION index 5fb5a6b4f5..d2ab029d32 100644 --- a/projects/tinkerbell/rufio/GOLANG_VERSION +++ b/projects/tinkerbell/rufio/GOLANG_VERSION @@ -1 +1 @@ -1.20 +1.21 diff --git a/projects/tinkerbell/rufio/Makefile b/projects/tinkerbell/rufio/Makefile index 925370add8..183a7e7d0e 100644 --- a/projects/tinkerbell/rufio/Makefile +++ b/projects/tinkerbell/rufio/Makefile @@ -10,7 +10,6 @@ BINARY_TARGET_FILES=manager SOURCE_PATTERNS=. HAS_S3_ARTIFACTS=true -EXCLUDE_FROM_UPGRADE_BUILDSPEC=true include $(BASE_DIRECTORY)/Common.mk diff --git a/projects/tinkerbell/rufio/README.md b/projects/tinkerbell/rufio/README.md index 2a2c36a8ad..87cb81b179 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-afd7cd82fa08dae8f9f3ffac96eb030176f3abbd-blue) +![Version](https://img.shields.io/badge/version-v0.3.3-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/tools/version-tracker/buildspecs/upgrade.yml b/tools/version-tracker/buildspecs/upgrade.yml index 6c1272b5bb..ee428e80e8 100644 --- a/tools/version-tracker/buildspecs/upgrade.yml +++ b/tools/version-tracker/buildspecs/upgrade.yml @@ -507,6 +507,13 @@ batch: variables: PROJECT_PATH: projects/tinkerbell/hegel CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.hegel + - identifier: tinkerbell_rufio + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/tinkerbell/rufio + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio - identifier: vmware_govmomi env: type: ARM_CONTAINER @@ -582,6 +589,7 @@ batch: - rancher_local_path_provisioner - replicatedhq_troubleshoot - tinkerbell_hegel + - tinkerbell_rufio - vmware_govmomi version: 0.2 env: diff --git a/tools/version-tracker/pkg/constants/constants.go b/tools/version-tracker/pkg/constants/constants.go index 11fbd9e54f..2d5607fe7d 100644 --- a/tools/version-tracker/pkg/constants/constants.go +++ b/tools/version-tracker/pkg/constants/constants.go @@ -284,6 +284,10 @@ var ( SourceOfTruthFile: ".github/workflows/ci.yaml", GoVersionSearchString: `GO_VERSION: "(1\.\d\d)"`, }, + "tinkerbell/rufio": { + SourceOfTruthFile: ".github/workflows/ci.yaml", + GoVersionSearchString: `GO_VERSION: '(1\.\d\d)'`, + }, } ProjectsWithUnconventionalUpgradeFlows = []string{