From 4c9599dbcc4d8e835ba570c75aaa18150a6901a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 21:17:55 +0000 Subject: [PATCH 1/2] Bump github.com/tinkerbell/tink from 0.8.0 to 0.9.0 Bumps [github.com/tinkerbell/tink](https://github.com/tinkerbell/tink) from 0.8.0 to 0.9.0. - [Release notes](https://github.com/tinkerbell/tink/releases) - [Commits](https://github.com/tinkerbell/tink/compare/v0.8.0...v0.9.0) --- updated-dependencies: - dependency-name: github.com/tinkerbell/tink dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 1 - go.sum | 2 -- 2 files changed, 3 deletions(-) diff --git a/go.mod b/go.mod index a8a63be6..b6120b61 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,6 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 - github.com/tinkerbell/tink v0.8.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/apimachinery v0.29.1 k8s.io/client-go v0.29.0 diff --git a/go.sum b/go.sum index 231f3e9d..87c78ff6 100644 --- a/go.sum +++ b/go.sum @@ -189,8 +189,6 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/tinkerbell/tink v0.8.0 h1:qgl/rglpO5Rvq6UKZd29O6X9mDgZZYgf841+Y0IYWak= -github.com/tinkerbell/tink v0.8.0/go.mod h1:bfAkSH7J/QQYIyqZRR6IQp8w78aac6l8Z2Lws5uXz6A= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= From 56b0bca5fd608590dd02cc54e98ef69d28041413 Mon Sep 17 00:00:00 2001 From: Chris Doherty Date: Thu, 18 Jan 2024 15:22:50 -0600 Subject: [PATCH 2/2] Patch tinkerbell/tink update Signed-off-by: Chris Doherty --- go.mod | 1 + go.sum | 2 ++ internal/backend/kubernetes/backend.go | 2 +- internal/backend/kubernetes/backend_integration_test.go | 2 +- internal/backend/kubernetes/backend_test.go | 2 +- internal/backend/kubernetes/hack.go | 2 +- internal/backend/kubernetes/index.go | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index b6120b61..78a3b970 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 + github.com/tinkerbell/tink v0.9.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/apimachinery v0.29.1 k8s.io/client-go v0.29.0 diff --git a/go.sum b/go.sum index 87c78ff6..f8e6e0ab 100644 --- a/go.sum +++ b/go.sum @@ -189,6 +189,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/tinkerbell/tink v0.9.0 h1:W7X/OEmhyYXE/kPVu1U31fpugVHoc2qsAvBtsZ7mkDg= +github.com/tinkerbell/tink v0.9.0/go.mod h1:r8gDvx/Y+GEFeT9xwKa14ULrkMre8mYmH3/E9VbUkEw= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= diff --git a/internal/backend/kubernetes/backend.go b/internal/backend/kubernetes/backend.go index c17a435f..a08bcb0b 100644 --- a/internal/backend/kubernetes/backend.go +++ b/internal/backend/kubernetes/backend.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/tinkerbell/hegel/internal/frontend/ec2" - tinkv1 "github.com/tinkerbell/tink/pkg/apis/core/v1alpha1" + tinkv1 "github.com/tinkerbell/tink/api/v1alpha1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" kubescheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/clientcmd" diff --git a/internal/backend/kubernetes/backend_integration_test.go b/internal/backend/kubernetes/backend_integration_test.go index ec0fa3d1..a333ffbd 100644 --- a/internal/backend/kubernetes/backend_integration_test.go +++ b/internal/backend/kubernetes/backend_integration_test.go @@ -7,7 +7,7 @@ import ( "testing" . "github.com/tinkerbell/hegel/internal/backend/kubernetes" - tinkv1 "github.com/tinkerbell/tink/pkg/apis/core/v1alpha1" + tinkv1 "github.com/tinkerbell/tink/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/backend/kubernetes/backend_test.go b/internal/backend/kubernetes/backend_test.go index 987328a3..38d8e438 100644 --- a/internal/backend/kubernetes/backend_test.go +++ b/internal/backend/kubernetes/backend_test.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" . "github.com/tinkerbell/hegel/internal/backend/kubernetes" "github.com/tinkerbell/hegel/internal/frontend/ec2" - tinkv1 "github.com/tinkerbell/tink/pkg/apis/core/v1alpha1" + tinkv1 "github.com/tinkerbell/tink/api/v1alpha1" crclient "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/backend/kubernetes/hack.go b/internal/backend/kubernetes/hack.go index 4d8bb0e3..219423ff 100644 --- a/internal/backend/kubernetes/hack.go +++ b/internal/backend/kubernetes/hack.go @@ -5,7 +5,7 @@ import ( "encoding/json" "github.com/tinkerbell/hegel/internal/frontend/hack" - tinkv1 "github.com/tinkerbell/tink/pkg/apis/core/v1alpha1" + tinkv1 "github.com/tinkerbell/tink/api/v1alpha1" ) func (b *Backend) GetHackInstance(ctx context.Context, ip string) (hack.Instance, error) { diff --git a/internal/backend/kubernetes/index.go b/internal/backend/kubernetes/index.go index 1f9c6124..f01f8214 100644 --- a/internal/backend/kubernetes/index.go +++ b/internal/backend/kubernetes/index.go @@ -1,7 +1,7 @@ package kubernetes import ( - "github.com/tinkerbell/tink/pkg/apis/core/v1alpha1" + "github.com/tinkerbell/tink/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/client" )