Skip to content

Commit

Permalink
Merge pull request #1135 from NVIDIA/sig-k8s-json-no-dep
Browse files Browse the repository at this point in the history
use apimachinery/pkg/util/json instead of sigs.k8s.io/json
  • Loading branch information
tariq1890 authored Nov 23, 2024
2 parents df7770a + 3fa73e4 commit fe9595a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions cmd/gpuop-cfg/validate/csv/alm-examples.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ import (
"fmt"

"github.com/operator-framework/api/pkg/operators/v1alpha1"
"sigs.k8s.io/json"
"k8s.io/apimachinery/pkg/util/json"

v1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
)

func validateALMExample(csv *v1alpha1.ClusterServiceVersion) error {
cpList := []v1.ClusterPolicy{}
example := csv.Annotations["alm-examples"]
err := json.UnmarshalCaseSensitivePreserveInts([]byte(example), &cpList)
err := json.Unmarshal([]byte(example), &cpList)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ require (
k8s.io/client-go v0.31.2
k8s.io/klog/v2 v2.130.1
sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
sigs.k8s.io/yaml v1.4.0
)

Expand Down Expand Up @@ -176,6 +175,7 @@ require (
k8s.io/kubectl v0.31.0 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
oras.land/oras-go v1.2.5 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.17.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down

0 comments on commit fe9595a

Please sign in to comment.