Merge pull request #107 from flatcar-linux/updates

Import github.com/flatcar-linux/locksmith instead of coreos version
flatcar · Nov 30, 2021 · 7463b41 · 7463b41
2 parents 494a451 + 4a8033c
commit 7463b41
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ go 1.17
 require (
 	github.com/blang/semver/v4 v4.0.0
 	github.com/coreos/go-systemd/v22 v22.3.2
-	github.com/coreos/locksmith v0.6.2
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
+	github.com/flatcar-linux/locksmith v0.6.2
 	github.com/godbus/dbus/v5 v5.0.6
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.5.5

diff --git a/go.sum b/go.sum
@@ -43,8 +43,6 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/coreos/locksmith v0.6.2 h1:yd/7pCRpnmXd1EA9AVbNtMIo5wCxSlRCPzP8wzZEW9Q=
-github.com/coreos/locksmith v0.6.2/go.mod h1:mSLRr7SVSEAIugjic7+TXif/+ZQQq0zCks1vptuj2fs=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -58,6 +56,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs=
 github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/flatcar-linux/locksmith v0.6.2 h1:adob9j1hAuUOYiuA5HNBGRui9fIcQ2aGd0zngFwnH6o=
+github.com/flatcar-linux/locksmith v0.6.2/go.mod h1:KB/dT98joaZPse2Nsn4fi85o0l3sketGHWBn7xyyrU8=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/flatcar-linux/locksmith/pkg/timeutil"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
@@ -20,7 +21,6 @@ import (
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
 
-	"github.com/coreos/locksmith/pkg/timeutil"
 	"github.com/flatcar-linux/flatcar-linux-update-operator/pkg/constants"
 	"github.com/flatcar-linux/flatcar-linux-update-operator/pkg/k8sutil"
 )

diff --git a/pkg/operator/operator_internal_test.go b/pkg/operator/operator_internal_test.go
@@ -7,13 +7,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/flatcar-linux/locksmith/pkg/timeutil"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 
-	"github.com/coreos/locksmith/pkg/timeutil"
 	"github.com/flatcar-linux/flatcar-linux-update-operator/pkg/constants"
 )
 

diff --git a/vendor/github.com/coreos/locksmith/LICENSE → ...ithub.com/flatcar-linux/locksmith/LICENSE b/vendor/github.com/coreos/locksmith/LICENSE → ...ithub.com/flatcar-linux/locksmith/LICENSE
diff --git a/vendor/github.com/coreos/locksmith/NOTICE → ...git.luolix.top/flatcar-linux/locksmith/NOTICE b/vendor/github.com/coreos/locksmith/NOTICE → ...git.luolix.top/flatcar-linux/locksmith/NOTICE
diff --git a/...coreos/locksmith/pkg/timeutil/periodic.go → ...-linux/locksmith/pkg/timeutil/periodic.go b/...coreos/locksmith/pkg/timeutil/periodic.go → ...-linux/locksmith/pkg/timeutil/periodic.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -4,9 +4,6 @@ github.com/blang/semver/v4
 # github.com/coreos/go-systemd/v22 v22.3.2
 ## explicit; go 1.12
 github.com/coreos/go-systemd/v22/login1
-# github.com/coreos/locksmith v0.6.2
-## explicit
-github.com/coreos/locksmith/pkg/timeutil
 # github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
 ## explicit
 github.com/coreos/pkg/flagutil
@@ -16,6 +13,9 @@ github.com/davecgh/go-spew/spew
 # github.com/evanphx/json-patch v4.11.0+incompatible
 ## explicit
 github.com/evanphx/json-patch
+# github.com/flatcar-linux/locksmith v0.6.2
+## explicit
+github.com/flatcar-linux/locksmith/pkg/timeutil
 # github.com/go-logr/logr v1.2.0
 ## explicit; go 1.16
 github.com/go-logr/logr