From 3d4bf493d3838aa8430b476ff8627a536b6b9967 Mon Sep 17 00:00:00 2001 From: Sheng Lin Date: Wed, 4 Jun 2025 18:12:15 -0400 Subject: [PATCH] Change yaml package to sigs.k8s.io/yaml Signed-off-by: Sheng Lin --- go.mod | 2 +- internal/controller/nemocustomizer_controller.go | 2 +- internal/controller/nimcache_controller.go | 2 +- internal/nimparser/utils/utils.go | 2 +- internal/nimparser/v1/nimparser.go | 2 +- internal/nimparser/v2/nimparser.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 88be9714f..b064d22bd 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,6 @@ require ( github.com/prometheus/client_golang v1.20.5 github.com/prometheus/client_model v0.6.1 github.com/stretchr/testify v1.9.0 - gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.16.1 k8s.io/api v0.31.1 k8s.io/apiextensions-apiserver v0.31.1 @@ -180,6 +179,7 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiserver v0.31.1 // indirect k8s.io/cli-runtime v0.31.0 // indirect diff --git a/internal/controller/nemocustomizer_controller.go b/internal/controller/nemocustomizer_controller.go index d2ac93dac..2bbbfc17a 100644 --- a/internal/controller/nemocustomizer_controller.go +++ b/internal/controller/nemocustomizer_controller.go @@ -24,7 +24,6 @@ import ( "github.com/go-logr/logr" monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" - "gopkg.in/yaml.v2" appsv1 "k8s.io/api/apps/v1" autoscalingv2 "k8s.io/api/autoscaling/v2" corev1 "k8s.io/api/core/v1" @@ -42,6 +41,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/predicate" + "sigs.k8s.io/yaml" appsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1" "github.com/NVIDIA/k8s-nim-operator/internal/conditions" diff --git a/internal/controller/nimcache_controller.go b/internal/controller/nimcache_controller.go index f117adc6a..691fda47f 100644 --- a/internal/controller/nimcache_controller.go +++ b/internal/controller/nimcache_controller.go @@ -28,7 +28,6 @@ import ( "time" "github.com/go-logr/logr" - "gopkg.in/yaml.v2" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" @@ -48,6 +47,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" + "sigs.k8s.io/yaml" appsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1" "github.com/NVIDIA/k8s-nim-operator/internal/conditions" diff --git a/internal/nimparser/utils/utils.go b/internal/nimparser/utils/utils.go index d5a35df68..34801413e 100644 --- a/internal/nimparser/utils/utils.go +++ b/internal/nimparser/utils/utils.go @@ -20,7 +20,7 @@ import ( "regexp" "strings" - yaml "gopkg.in/yaml.v2" + yaml "sigs.k8s.io/yaml" nimparser "github.com/NVIDIA/k8s-nim-operator/internal/nimparser" nimparserv1 "github.com/NVIDIA/k8s-nim-operator/internal/nimparser/v1" diff --git a/internal/nimparser/v1/nimparser.go b/internal/nimparser/v1/nimparser.go index f206c5870..b4be3b570 100644 --- a/internal/nimparser/v1/nimparser.go +++ b/internal/nimparser/v1/nimparser.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" appsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1" "github.com/NVIDIA/k8s-nim-operator/internal/nimparser" diff --git a/internal/nimparser/v2/nimparser.go b/internal/nimparser/v2/nimparser.go index 307764cbe..4eda07699 100644 --- a/internal/nimparser/v2/nimparser.go +++ b/internal/nimparser/v2/nimparser.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" appsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1" "github.com/NVIDIA/k8s-nim-operator/internal/nimparser"