diff --git a/Jenkinsfile b/Jenkinsfile index 846fda3e5d..39730002cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -358,7 +358,7 @@ pipeline { ENABLE_LOGGING = "true" } agent { - label 'docker' + label 'docker-x64-min' } options { disableConcurrentBuilds(abortPrevious: true) diff --git a/e2e-tests/init-deploy/compare/backup-70.json b/e2e-tests/init-deploy/compare/backup-70.json index 4e55be2734..c0c331207b 100644 --- a/e2e-tests/init-deploy/compare/backup-70.json +++ b/e2e-tests/init-deploy/compare/backup-70.json @@ -128,6 +128,15 @@ "update" ] }, + { + "resource": { + "db": "", + "collection": "system.views" + }, + "actions": [ + "dropCollection" + ] + }, { "resource": { "db": "admin", @@ -236,15 +245,6 @@ "updateSearchIndex" ] }, - { - "resource": { - "db": "admin", - "collection": "system.views" - }, - "actions": [ - "dropCollection" - ] - }, { "resource": { "db": "admin", diff --git a/go.mod b/go.mod index fceec3f14f..54898c77b2 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( k8s.io/client-go v0.33.3 sigs.k8s.io/controller-runtime v0.21.0 sigs.k8s.io/mcs-api v0.2.0 - sigs.k8s.io/yaml v1.5.0 + sigs.k8s.io/yaml v1.6.0 ) require ( diff --git a/go.sum b/go.sum index 2852ae003c..f23d483fd3 100644 --- a/go.sum +++ b/go.sum @@ -625,5 +625,5 @@ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxO sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc= sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= -sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ= -sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=