From 6f120f9660f56d6050864b9da7233222ae231118 Mon Sep 17 00:00:00 2001
From: Sean Sullivan <seans@google.com>
Date: Wed, 19 Jun 2019 14:43:36 -0700
Subject: [PATCH] Updated publishing dependencies rules

---
 pkg/kubectl/rolling_updater.go |  1 -
 staging/publishing/rules.yaml  | 24 ++++++++++++------------
 vendor/modules.txt             |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go
index 3d7b15bc17e..ea730072c31 100644
--- a/pkg/kubectl/rolling_updater.go
+++ b/pkg/kubectl/rolling_updater.go
@@ -37,7 +37,6 @@ import (
 	deploymentutil "k8s.io/kubectl/pkg/util/deployment"
 	"k8s.io/kubectl/pkg/util/podutils"
 	"k8s.io/kubernetes/pkg/kubectl/util"
-	"k8s.io/kubernetes/pkg/kubectl/util/podutils"
 	"k8s.io/utils/integer"
 	utilpointer "k8s.io/utils/pointer"
 )
diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
index dab1c1c8275..da3587b7c40 100644
--- a/staging/publishing/rules.yaml
+++ b/staging/publishing/rules.yaml
@@ -614,21 +614,21 @@ rules:
       dir: staging/src/k8s.io/kubectl
     name: master
     dependencies:
-      - repository: api
-        branch: master
-      - repository: apimachinery
-        branch: master
-      - repository: client-go
-        branch: master
+    - repository: api
+      branch: master
+    - repository: apimachinery
+      branch: master
+    - repository: client-go
+      branch: master
   - source:
       branch: release-1.15
       dir: staging/src/k8s.io/kubectl
     name: release-1.15
     go: 1.12.5
     dependencies:
-      - repository: api
-        branch: release-1.15
-      - repository: apimachinery
-        branch: release-1.15
-      - repository: client-go
-        branch: release-12.0
+    - repository: api
+      branch: release-1.15
+    - repository: apimachinery
+      branch: release-1.15
+    - repository: client-go
+      branch: release-12.0
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 3cbc0b808b3..3f13d203f7b 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1633,12 +1633,12 @@ k8s.io/kube-proxy/config/v1alpha1
 # k8s.io/kube-scheduler v0.0.0 => ./staging/src/k8s.io/kube-scheduler
 k8s.io/kube-scheduler/config/v1alpha1
 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl
+k8s.io/kubectl/pkg/util/deployment
 k8s.io/kubectl/pkg/util/interrupt
 k8s.io/kubectl/pkg/util/podutils
 k8s.io/kubectl/pkg/util/printers
 k8s.io/kubectl/pkg/util/templates
 k8s.io/kubectl/pkg/util/term
-k8s.io/kubectl/pkg/util/deployment
 # k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet
 k8s.io/kubelet/config/v1beta1
 # k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers