Skip to content

Commit

Permalink
🎡 Remove k8s.io/kubernetes dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
@cblecker
cblecker committed Nov 2, 2017
1 parent 7dea542 commit 87583b5
Show file tree
Hide file tree
Showing 72 changed files with 86 additions and 86 deletions.
4 changes: 2 additions & 2 deletions mungegithub/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ go_library(
"//mungegithub/reports:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/flag:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/example-one-off/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ go_library(
"//mungegithub/options:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/flag:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/example-one-off/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/golang/glog"
"github.com/spf13/cobra"

utilflag "k8s.io/kubernetes/pkg/util/flag"
utilflag "k8s.io/apiserver/pkg/util/flag"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
)
Expand Down
6 changes: 3 additions & 3 deletions mungegithub/features/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ go_test(
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/google/go-github/github:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
],
)

Expand All @@ -37,8 +37,8 @@ go_library(
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus/promhttp:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/yaml:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/features/branch-protection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package features

import (
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/mungeopts"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/features/features.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package features
import (
"fmt"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"

Expand Down
4 changes: 2 additions & 2 deletions mungegithub/features/repo-updates.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"regexp"
"strings"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/util/yaml"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/features/repo-updates_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/golang/glog"
"github.com/google/go-github/github"
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/features/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/mungeopts"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/github/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ go_library(
"//vendor/github.com/gregjones/httpcache/diskcache:go_default_library",
"//vendor/github.com/peterbourgon/diskv:go_default_library",
"//vendor/golang.org/x/oauth2:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/github/github.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"text/tabwriter"
"time"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/options"

"github.com/golang/glog"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/github/status_change.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package github
import (
"sync"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
)

// StatusChange keeps track of issue/commit for status changes
Expand Down
4 changes: 2 additions & 2 deletions mungegithub/mungegithub.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"path/filepath"
"time"

utilflag "k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
utilflag "k8s.io/apiserver/pkg/util/flag"
"k8s.io/test-infra/mungegithub/features"
github_util "k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/mungeopts"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungeopts/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ go_library(
importpath = "k8s.io/test-infra/mungegithub/mungeopts",
deps = [
"//mungegithub/options:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungeopts/mungeopts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package mungeopts
import (
"time"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/options"
)

Expand Down
8 changes: 4 additions & 4 deletions mungegithub/mungers/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ go_test(
"//mungegithub/sharedmux:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/google/go-github/github:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/contrib/test-utils/utils:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/clock:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library",
],
)

Expand Down Expand Up @@ -102,10 +102,10 @@ go_library(
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/google/go-github/github:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
"//vendor/k8s.io/contrib/test-utils/utils:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/clock:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/yaml:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/approval-handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

githubapi "github.com/google/go-github/github"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/mungers/approvers"
Expand Down
4 changes: 2 additions & 2 deletions mungegithub/mungers/approvers/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ go_test(
],
importpath = "k8s.io/test-infra/mungegithub/mungers/approvers",
library = ":go_default_library",
deps = ["//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library"],
deps = ["//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library"],
)

go_library(
Expand All @@ -23,7 +23,7 @@ go_library(
importpath = "k8s.io/test-infra/mungegithub/mungers/approvers",
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/approvers/approvers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"reflect"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
)

func TestUnapprovedFiles(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/approvers/owners.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"text/template"

"github.com/golang/glog"
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/approvers/owners_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package approvers
import (
"testing"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"

"path/filepath"
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/assign-fixes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package mungers

import (
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
4 changes: 2 additions & 2 deletions mungegithub/mungers/block_paths.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"os"
"regexp"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/util/yaml"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/blunderbuss.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"math"
"math/rand"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
4 changes: 2 additions & 2 deletions mungegithub/mungers/check-labels.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"os"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/util/yaml"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/test-infra/mungegithub/features"
githubhelper "k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/mungers/mungerutil"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/cherrypick-auto-approve.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strconv"
"strings"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/cherrypick-clear-after-merge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"strings"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/cherrypick-label-unapproved.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package mungers
import (
"fmt"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/cherrypick-must-have-milestone.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package mungers
import (
"fmt"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/cherrypick-queue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sync"
"time"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/close-stale.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"regexp"
"time"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/mungers/mungerutil"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/comment-deleter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package mungers

import (
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/e2e/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ go_library(
"//mungegithub/mungers/flakesync:go_default_library",
"//mungegithub/options:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/contrib/test-utils/utils:go_default_library",
"//vendor/k8s.io/kubernetes/pkg/util/sets:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/e2e/e2e.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"sync"

"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/contrib/test-utils/utils"
"k8s.io/kubernetes/pkg/util/sets"
cache "k8s.io/test-infra/mungegithub/mungers/flakesync"
"k8s.io/test-infra/mungegithub/options"

Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/inactive-review-handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/golang/glog"
githubapi "github.com/google/go-github/github"
"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/mungers/matchers"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/issue-categorizer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"net/url"
"strings"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/options"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/lgtm_after_commit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"regexp"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/mungers/mungerutil"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/milestone-maintainer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strings"
"time"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/features"
"k8s.io/test-infra/mungegithub/github"
"k8s.io/test-infra/mungegithub/mungers/approvers"
Expand Down
2 changes: 1 addition & 1 deletion mungegithub/mungers/milestone-maintainer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"testing"
"time"

"k8s.io/kubernetes/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/test-infra/mungegithub/github"
github_test "k8s.io/test-infra/mungegithub/github/testing"
c "k8s.io/test-infra/mungegithub/mungers/matchers/comment"
Expand Down
Loading

0 comments on commit 87583b5

Please sign in to comment.