From 7e0a907d1cb0cd835b93140d7cdeb15be136de84 Mon Sep 17 00:00:00 2001 From: kayrus Date: Mon, 8 Jul 2024 12:34:36 +0200 Subject: [PATCH] Use sigs.k8s.io/yaml for k8s credentials unmarshalling --- ccloud/ccloud_kubernetes_v1.go | 2 +- go.mod | 3 ++- go.sum | 8 -------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ccloud/ccloud_kubernetes_v1.go b/ccloud/ccloud_kubernetes_v1.go index 48d63d5e..08bb5f31 100644 --- a/ccloud/ccloud_kubernetes_v1.go +++ b/ccloud/ccloud_kubernetes_v1.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/sapcc/kubernikus/pkg/api/client/operations" "github.com/sapcc/kubernikus/pkg/api/models" - "gopkg.in/yaml.v3" clientcmdapi "k8s.io/client-go/tools/clientcmd/api/v1" + "sigs.k8s.io/yaml" ) const ( diff --git a/go.mod b/go.mod index be7addf9..bb0dfbf1 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,8 @@ require ( github.com/sapcc/andromeda v0.0.2-0.20240708030448-e1ee3841282e github.com/sapcc/gophercloud-sapcc v1.0.0 github.com/sapcc/kubernikus v1.0.1-0.20240619130954-d2e31494f91c - gopkg.in/yaml.v3 v3.0.1 k8s.io/client-go v0.30.2 + sigs.k8s.io/yaml v1.4.0 ) require ( @@ -94,6 +94,7 @@ require ( google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apimachinery v0.30.2 // indirect k8s.io/klog/v2 v2.120.1 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/go.sum b/go.sum index 986b0d41..72897532 100644 --- a/go.sum +++ b/go.sum @@ -192,8 +192,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= -github.com/sapcc/andromeda v0.0.2-0.20240703201843-d4b95e0cad93 h1:w4HDZAmFtpNNuJtMe1FiU/y8JWQt6MhED5t2yjwFaQs= -github.com/sapcc/andromeda v0.0.2-0.20240703201843-d4b95e0cad93/go.mod h1:H4kZtEa90ooNOayhxKst14sIXqyzQ9mKWYNq0WTjA/M= github.com/sapcc/andromeda v0.0.2-0.20240708030448-e1ee3841282e h1:lMWB/41odcIid1jxNcKEhVSNUFWSOzu4Fj7j5OXONOQ= github.com/sapcc/andromeda v0.0.2-0.20240708030448-e1ee3841282e/go.mod h1:7uTlgV56JprJAAk6xYQ5L+wjuPCOpkOFpCVPdpuPY5U= github.com/sapcc/gophercloud-sapcc v1.0.0 h1:jPPIygmrHNS/d1fGEmxfSK99TgfL2p8UX+l6veYHcJw= @@ -240,8 +238,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -256,8 +252,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -283,8 +277,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=