diff --git a/go.mod b/go.mod index 1311d383de..64485d3e0a 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( k8s.io/component-base v0.23.2 k8s.io/klog/v2 v2.30.0 k8s.io/kubectl v0.23.2 - sigs.k8s.io/cli-utils v0.28.1 + sigs.k8s.io/cli-utils v0.29.1 sigs.k8s.io/controller-runtime v0.11.0 sigs.k8s.io/kustomize/api v0.11.1 sigs.k8s.io/kustomize/kyaml v0.13.3 diff --git a/go.sum b/go.sum index b1c6c87421..06f70636b1 100644 --- a/go.sum +++ b/go.sum @@ -1214,8 +1214,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= -sigs.k8s.io/cli-utils v0.28.1 h1:IPd8Fo461tXmW5/RumkujIrRSVJxZYcWD97FrzVPvX0= -sigs.k8s.io/cli-utils v0.28.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= +sigs.k8s.io/cli-utils v0.29.1 h1:XTxbVitgTzfTKSIcZ2pBQcgj8RHNO9S0yTirtOFvvPQ= +sigs.k8s.io/cli-utils v0.29.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= diff --git a/porch/apiserver/go.mod b/porch/apiserver/go.mod index 9bc7062e70..f2ea73f43f 100644 --- a/porch/apiserver/go.mod +++ b/porch/apiserver/go.mod @@ -149,7 +149,7 @@ require ( k8s.io/cli-runtime v0.23.2 // indirect k8s.io/kubectl v0.23.2 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 // indirect - sigs.k8s.io/cli-utils v0.28.1 // indirect + sigs.k8s.io/cli-utils v0.29.1 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/kustomize/api v0.11.1 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect diff --git a/porch/apiserver/go.sum b/porch/apiserver/go.sum index 81d3c32fd5..1038e526b3 100644 --- a/porch/apiserver/go.sum +++ b/porch/apiserver/go.sum @@ -1710,8 +1710,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27 h1:KQOkVzXrLNb0EP6W0FD6u3CCPAwgXFYwZitbj7K0P0Y= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= -sigs.k8s.io/cli-utils v0.28.1 h1:IPd8Fo461tXmW5/RumkujIrRSVJxZYcWD97FrzVPvX0= -sigs.k8s.io/cli-utils v0.28.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= +sigs.k8s.io/cli-utils v0.29.1 h1:XTxbVitgTzfTKSIcZ2pBQcgj8RHNO9S0yTirtOFvvPQ= +sigs.k8s.io/cli-utils v0.29.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= diff --git a/porch/controllers/remoterootsync/go.sum b/porch/controllers/remoterootsync/go.sum index 8e5c41ffb5..a191a0f40c 100644 --- a/porch/controllers/remoterootsync/go.sum +++ b/porch/controllers/remoterootsync/go.sum @@ -1637,7 +1637,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= -sigs.k8s.io/cli-utils v0.28.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= +sigs.k8s.io/cli-utils v0.29.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= diff --git a/porch/engine/go.mod b/porch/engine/go.mod index cf37db9b32..f2823e57f5 100644 --- a/porch/engine/go.mod +++ b/porch/engine/go.mod @@ -110,7 +110,7 @@ require ( k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect k8s.io/kubectl v0.23.2 // indirect k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect - sigs.k8s.io/cli-utils v0.28.1 // indirect + sigs.k8s.io/cli-utils v0.29.1 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/kustomize/api v0.11.1 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect diff --git a/porch/engine/go.sum b/porch/engine/go.sum index e127ceb6de..c67e1cf035 100644 --- a/porch/engine/go.sum +++ b/porch/engine/go.sum @@ -1649,8 +1649,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= -sigs.k8s.io/cli-utils v0.28.1 h1:IPd8Fo461tXmW5/RumkujIrRSVJxZYcWD97FrzVPvX0= -sigs.k8s.io/cli-utils v0.28.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= +sigs.k8s.io/cli-utils v0.29.1 h1:XTxbVitgTzfTKSIcZ2pBQcgj8RHNO9S0yTirtOFvvPQ= +sigs.k8s.io/cli-utils v0.29.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= diff --git a/porch/hack/verify-fix-all.sh b/porch/hack/verify-fix-all.sh index 2037b341f7..64bf1237b2 100755 --- a/porch/hack/verify-fix-all.sh +++ b/porch/hack/verify-fix-all.sh @@ -22,7 +22,7 @@ make -C "${REPO_ROOT}/porch" fix-all changes=$(git status --porcelain || true) if [ -n "${changes}" ]; then - echo "ERROR: some files changes, please run `make fixup`" + echo "ERROR: some files changed, please run 'make -C porch fix-all'" echo "changed files:" printf "%s" "${changes}\n" echo "git diff:" diff --git a/porch/repository/go.sum b/porch/repository/go.sum index 1582d9a39b..2501034e6c 100644 --- a/porch/repository/go.sum +++ b/porch/repository/go.sum @@ -1609,7 +1609,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= -sigs.k8s.io/cli-utils v0.28.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= +sigs.k8s.io/cli-utils v0.29.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= diff --git a/porch/test/go.sum b/porch/test/go.sum index 0038096a95..f0ad9df646 100644 --- a/porch/test/go.sum +++ b/porch/test/go.sum @@ -1588,7 +1588,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= -sigs.k8s.io/cli-utils v0.28.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= +sigs.k8s.io/cli-utils v0.29.1/go.mod h1:WDVRa5/eQBKntG++uyKdyT+xU7MLdCR4XsgseqL5uX4= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=