Skip to content

Commit 52de932

Browse files
sunnylovestiramisusunnylovestiramisu
committed
Update go.mod
1 parent 72e7e4b commit 52de932

File tree

17 files changed

+648
-335
lines changed

17 files changed

+648
-335
lines changed

‎go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ require (
2222
k8s.io/apimachinery v0.22.0
2323
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
2424
k8s.io/component-base v0.22.0
25-
k8s.io/klog/v2 v2.60.1
25+
k8s.io/klog/v2 v2.80.1
2626
k8s.io/kubernetes v1.22.0
2727
k8s.io/mount-utils v0.22.0
2828
k8s.io/test-infra v0.0.0-20200115230622-70a5174aa78d
29-
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
29+
k8s.io/utils v0.0.0-20230711102312-30195339c3c7
3030
)
3131

32+
require google.golang.org/protobuf v1.26.0
33+
3234
require (
3335
github.com/Microsoft/go-winio v0.4.16 // indirect
3436
github.com/beorn7/perks v1.0.1 // indirect
@@ -65,7 +67,6 @@ require (
6567
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
6668
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
6769
google.golang.org/appengine v1.6.6 // indirect
68-
google.golang.org/protobuf v1.26.0 // indirect
6970
gopkg.in/inf.v0 v0.9.1 // indirect
7071
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7172
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,6 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k
647647
github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
648648
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
649649
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
650-
github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
651650
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
652651
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
653652
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
@@ -1218,8 +1217,8 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
12181217
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
12191218
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
12201219
k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
1221-
k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc=
1222-
k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
1220+
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
1221+
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
12231222
k8s.io/kube-aggregator v0.22.0/go.mod h1:zHTepg0Q4tKzru7Pwg1QYHWrU/wrvIXM8hUdDAH66qg=
12241223
k8s.io/kube-controller-manager v0.22.0/go.mod h1:E/EYMoCj8bbPRmu19JF4B9QLyQL8Tywg+9Q/rg+F80U=
12251224
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
@@ -1245,8 +1244,9 @@ k8s.io/test-infra v0.0.0-20200115230622-70a5174aa78d/go.mod h1:d8SKryJBXAwfCFVL4
12451244
k8s.io/utils v0.0.0-20181019225348-5e321f9a457c/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
12461245
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
12471246
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
1248-
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 h1:imL9YgXQ9p7xmPzHFm/vVd/cF78jad+n4wK1ABwYtMM=
12491247
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
1248+
k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI5yiP5WwlfDoIyc=
1249+
k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
12501250
knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
12511251
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
12521252
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=

‎test/e2e/tests/single_zone_e2e_test.go

Lines changed: 1 addition & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"context"
1919
"fmt"
2020
"path/filepath"
21+
"regexp"
2122
"strings"
2223
"time"
2324

@@ -1287,91 +1288,3 @@ func zoneFromURL(url string) string {
12871288
}
12881289
return tokens[len(tokens)-1]
12891290
}
1290-
1291-
func setupKeyRing(ctx context.Context, parentName string, keyRingId string) (*kmspb.CryptoKey, []string) {
1292-
// Create KeyRing
1293-
ringReq := &kmspb.CreateKeyRingRequest{
1294-
Parent: parentName,
1295-
KeyRingId: keyRingId,
1296-
}
1297-
keyRing, err := kmsClient.CreateKeyRing(ctx, ringReq)
1298-
if !gce.IsGCEError(err, "alreadyExists") {
1299-
getKeyRingReq := &kmspb.GetKeyRingRequest{
1300-
Name: fmt.Sprintf("%s/keyRings/%s", parentName, keyRingId),
1301-
}
1302-
keyRing, err = kmsClient.GetKeyRing(ctx, getKeyRingReq)
1303-
1304-
}
1305-
Expect(err).To(BeNil(), "Failed to create or get key ring %v", keyRingId)
1306-
1307-
// Create CryptoKey in KeyRing
1308-
keyId := "test-key-" + string(uuid.NewUUID())
1309-
keyReq := &kmspb.CreateCryptoKeyRequest{
1310-
Parent: keyRing.Name,
1311-
CryptoKeyId: keyId,
1312-
CryptoKey: &kmspb.CryptoKey{
1313-
Purpose: kmspb.CryptoKey_ENCRYPT_DECRYPT,
1314-
VersionTemplate: &kmspb.CryptoKeyVersionTemplate{
1315-
Algorithm: kmspb.CryptoKeyVersion_GOOGLE_SYMMETRIC_ENCRYPTION,
1316-
},
1317-
},
1318-
}
1319-
key, err := kmsClient.CreateCryptoKey(ctx, keyReq)
1320-
Expect(err).To(BeNil(), "Failed to create crypto key %v in key ring %v", keyId, keyRing.Name)
1321-
1322-
keyVersions := []string{}
1323-
keyVersionReq := &kmspb.ListCryptoKeyVersionsRequest{
1324-
Parent: key.Name,
1325-
}
1326-
1327-
it := kmsClient.ListCryptoKeyVersions(ctx, keyVersionReq)
1328-
1329-
for {
1330-
keyVersion, err := it.Next()
1331-
if err == iterator.Done {
1332-
break
1333-
}
1334-
Expect(err).To(BeNil(), "Failed to list crypto key versions")
1335-
1336-
keyVersions = append(keyVersions, keyVersion.Name)
1337-
}
1338-
return key, keyVersions
1339-
}
1340-
1341-
type disk struct {
1342-
params map[string]string
1343-
validate func(disk *compute.Disk)
1344-
}
1345-
1346-
var typeToDisk = map[string]*disk{
1347-
standardDiskType: {
1348-
params: map[string]string{
1349-
common.ParameterKeyType: standardDiskType,
1350-
},
1351-
validate: func(disk *compute.Disk) {
1352-
Expect(disk.Type).To(ContainSubstring(standardDiskType))
1353-
},
1354-
},
1355-
extremeDiskType: {
1356-
params: map[string]string{
1357-
common.ParameterKeyType: extremeDiskType,
1358-
common.ParameterKeyProvisionedIOPSOnCreate: provisionedIOPSOnCreate,
1359-
},
1360-
validate: func(disk *compute.Disk) {
1361-
Expect(disk.Type).To(ContainSubstring(extremeDiskType))
1362-
Expect(disk.ProvisionedIops).To(Equal(provisionedIOPSOnCreateInt))
1363-
},
1364-
},
1365-
}
1366-
1367-
func merge(a, b map[string]string) map[string]string {
1368-
res := map[string]string{}
1369-
for k, v := range a {
1370-
res[k] = v
1371-
}
1372-
for k, v := range b {
1373-
res[k] = v
1374-
}
1375-
return res
1376-
>>>>>>> b9028774 (fix bug where volume cloning topology requirements are ignored when chosing the location of the volume)
1377-
}

‎vendor/k8s.io/klog/v2/OWNERS

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/klog/v2/README.md

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/klog/v2/contextual.go

Lines changed: 16 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/klog/v2/internal/dbg/dbg.go

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)