From 3b2cb3d6895d257e61103ba16f70aee280f64d81 Mon Sep 17 00:00:00 2001 From: Lukasz Raczylo Date: Wed, 4 Sep 2024 20:49:52 +0100 Subject: [PATCH] Update all dependencies --- Dockerfile | 2 +- PROJECT | 6 +++--- cmd/main.go | 6 +++--- go.mod | 3 +-- go.sum | 2 -- internal/controller/raczylo.com/clusterimage_controller.go | 4 ++-- .../controller/raczylo.com/clusterimage_controller_test.go | 2 +- .../controller/raczylo.com/clusterimageexport_controller.go | 4 ++-- .../raczylo.com/clusterimageexport_controller_test.go | 2 +- internal/controller/raczylo.com/suite_test.go | 2 +- {shared => internal/shared}/definitions.go | 0 {shared => internal/shared}/jobs.go | 2 +- {shared => internal/shared}/k8s.go | 2 +- test/e2e/e2e_test.go | 2 +- 14 files changed, 18 insertions(+), 21 deletions(-) rename {shared => internal/shared}/definitions.go (100%) rename {shared => internal/shared}/jobs.go (95%) rename {shared => internal/shared}/k8s.go (97%) diff --git a/Dockerfile b/Dockerfile index a48973e..4ba18b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN go mod download # Copy the go source COPY cmd/main.go cmd/main.go COPY api/ api/ -COPY internal/controller/ internal/controller/ +COPY internal/ internal/ # Build # the GOARCH has not a default value to allow the binary be built according to the host where the command diff --git a/PROJECT b/PROJECT index 79d91c7..761e368 100644 --- a/PROJECT +++ b/PROJECT @@ -7,7 +7,7 @@ layout: - go.kubebuilder.io/v4 multigroup: true projectName: kubernetes-images-sync-operator -repo: raczylo.com/kubernetes-images-sync-operator +repo: github.com/lukaszraczylo/kubernetes-images-sync-operator resources: - api: crdVersion: v1 @@ -15,7 +15,7 @@ resources: controller: true group: raczylo.com kind: ClusterImageExport - path: raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1 + path: github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1 version: v1 - api: crdVersion: v1 @@ -23,6 +23,6 @@ resources: controller: true group: raczylo.com kind: ClusterImage - path: raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1 + path: github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1 version: v1 version: "3" diff --git a/cmd/main.go b/cmd/main.go index c5840d9..612db35 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -35,9 +35,9 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - raczylocomv1 "raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1" - raczylocomcontroller "raczylo.com/kubernetes-images-sync-operator/internal/controller/raczylo.com" - "raczylo.com/kubernetes-images-sync-operator/shared" + raczylocomv1 "github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1" + raczylocomcontroller "github.com/lukaszraczylo/kubernetes-images-sync-operator/internal/controller/raczylo.com" + "github.com/lukaszraczylo/kubernetes-images-sync-operator/internal/shared" // +kubebuilder:scaffold:imports ) diff --git a/go.mod b/go.mod index b514ab5..6fd7cc2 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,9 @@ require ( github.com/go-logr/logr v1.4.2 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 - google.golang.org/grpc v1.65.0 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 k8s.io/client-go v0.31.0 - k8s.io/cri-api v0.31.0 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 sigs.k8s.io/controller-runtime v0.19.0 ) @@ -83,6 +81,7 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 254b861..a8ec01d 100644 --- a/go.sum +++ b/go.sum @@ -233,8 +233,6 @@ k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs= k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo= -k8s.io/cri-api v0.31.0 h1:6o0XrhWlc1/zseGCh+aMScdXCg5nT6KCGdyx7HQkSKo= -k8s.io/cri-api v0.31.0/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= diff --git a/internal/controller/raczylo.com/clusterimage_controller.go b/internal/controller/raczylo.com/clusterimage_controller.go index 173c1e9..5ccfc8a 100644 --- a/internal/controller/raczylo.com/clusterimage_controller.go +++ b/internal/controller/raczylo.com/clusterimage_controller.go @@ -18,8 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - raczylocomv1 "raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1" - "raczylo.com/kubernetes-images-sync-operator/shared" + raczylocomv1 "github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1" + "github.com/lukaszraczylo/kubernetes-images-sync-operator/internal/shared" ) type ClusterImageReconciler struct { diff --git a/internal/controller/raczylo.com/clusterimage_controller_test.go b/internal/controller/raczylo.com/clusterimage_controller_test.go index 03be91c..1cae439 100644 --- a/internal/controller/raczylo.com/clusterimage_controller_test.go +++ b/internal/controller/raczylo.com/clusterimage_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - raczylocomv1 "raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1" + raczylocomv1 "github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1" ) var _ = Describe("ClusterImage Controller", func() { diff --git a/internal/controller/raczylo.com/clusterimageexport_controller.go b/internal/controller/raczylo.com/clusterimageexport_controller.go index 52d5c4f..b26f453 100644 --- a/internal/controller/raczylo.com/clusterimageexport_controller.go +++ b/internal/controller/raczylo.com/clusterimageexport_controller.go @@ -20,8 +20,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log" - raczylocomv1 "raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1" - shared "raczylo.com/kubernetes-images-sync-operator/shared" + raczylocomv1 "github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1" + shared "github.com/lukaszraczylo/kubernetes-images-sync-operator/internal/shared" ) // ClusterImageExportReconciler reconciles a ClusterImageExport object diff --git a/internal/controller/raczylo.com/clusterimageexport_controller_test.go b/internal/controller/raczylo.com/clusterimageexport_controller_test.go index 1b38cfc..433b14f 100644 --- a/internal/controller/raczylo.com/clusterimageexport_controller_test.go +++ b/internal/controller/raczylo.com/clusterimageexport_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - raczylocomv1 "raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1" + raczylocomv1 "github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1" ) var _ = Describe("ClusterImageExport Controller", func() { diff --git a/internal/controller/raczylo.com/suite_test.go b/internal/controller/raczylo.com/suite_test.go index f69e781..3b4946a 100644 --- a/internal/controller/raczylo.com/suite_test.go +++ b/internal/controller/raczylo.com/suite_test.go @@ -33,7 +33,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - raczylocomv1 "raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1" + raczylocomv1 "github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1" // +kubebuilder:scaffold:imports ) diff --git a/shared/definitions.go b/internal/shared/definitions.go similarity index 100% rename from shared/definitions.go rename to internal/shared/definitions.go diff --git a/shared/jobs.go b/internal/shared/jobs.go similarity index 95% rename from shared/jobs.go rename to internal/shared/jobs.go index f1b8620..4509223 100644 --- a/shared/jobs.go +++ b/internal/shared/jobs.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" + raczylocomv1 "github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" - raczylocomv1 "raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1" ) type JobParams struct { diff --git a/shared/k8s.go b/internal/shared/k8s.go similarity index 97% rename from shared/k8s.go rename to internal/shared/k8s.go index aef9c68..0ed5cbf 100644 --- a/shared/k8s.go +++ b/internal/shared/k8s.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" + raczylocomv1 "github.com/lukaszraczylo/kubernetes-images-sync-operator/api/raczylo.com/v1" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" - raczylocomv1 "raczylo.com/kubernetes-images-sync-operator/api/raczylo.com/v1" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" ) diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index d9cffaa..d720646 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "raczylo.com/kubernetes-images-sync-operator/test/utils" + "github.com/lukaszraczylo/kubernetes-images-sync-operator/test/utils" ) const namespace = "kubernetes-images-sync-operator-system"