From b57a90e33812d1a3bbdb677ff98164cbca914a37 Mon Sep 17 00:00:00 2001 From: medyagh Date: Mon, 22 May 2017 10:50:06 -0500 Subject: [PATCH 1/2] Makefile improvements --- Makefile | 2 +- glide.lock | 17 +++++++++-------- glide.yaml | 12 ++---------- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index f974a32..e5437f3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ BINARY=k8guard-discover -VERSION=`git fetch;git describe --tags` +VERSION=`git fetch;git describe --tags > /dev/null 2>&1` BUILD=`date +%FT%T%z` LDFLAGS=-ldflags "-X main.Version=${VERSION} -X main.Build=${BUILD}" diff --git a/glide.lock b/glide.lock index ae4b7da..3cf6970 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: d9a09f489f22deb5faa0ff643c53f73d25d5b71264fa2ce78b76c3590b4a3542 -updated: 2017-05-18T16:23:51.442019789-05:00 +hash: aad5006fc5c96cd5c4d180042c44c920987224a958024f9d58e43b7bc9b82e41 +updated: 2017-05-19T16:29:30.999345684-05:00 imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 @@ -87,9 +87,11 @@ imports: version: 6633656539c1639d9d78127b7d47c622b5d7b6dc - name: github.com/jonboulle/clockwork version: 72f9bd7c4e0c2a40055ab3d0f09654f730cce982 +- name: github.com/juju/ratelimit + version: 77ed1c8a01217656d2080ad51981f6e99adaa177 - name: github.com/k8guard/k8guardlibs - version: 0558b3eafb02f616ee743b4ecfd93451ba2d33e1 - repo: https://github.com/k8guard/k8guardlibs.git + version: 3a98e5183df76e742cc564dd6489693ba6b50988 + repo: git@git.target.com:medyagh/k8guardlibs.git vcs: git subpackages: - config @@ -111,7 +113,7 @@ imports: - name: github.com/pborman/uuid version: ca53cad383cad2479bbba7f7a1a05797ec1386e4 - name: github.com/pierrec/lz4 - version: 88df27974e3644957507a1ca1866edc8e98d4897 + version: 5a3d2245f97fc249850e7802e3c01fad02a1c316 - name: github.com/pierrec/xxHash version: 5a004441f897722c627870a981d02b29924215fa subpackages: @@ -139,7 +141,7 @@ imports: - internal/bitbucket.org/ww/goautoneg - model - name: github.com/prometheus/procfs - version: d098ca18df8bc825079013daf7bacefbb1ee877e + version: 65c1f6f8f0fc1e2185eb9863a3bc751496404259 subpackages: - xfs - name: github.com/PuerkitoBio/purell @@ -212,7 +214,7 @@ imports: - name: gopkg.in/yaml.v2 version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 - name: k8s.io/client-go - version: d81cb85237595f720d83eda492bae8f6162fc5c0 + version: e121606b0d09b2e1c467183ee46217fa85a6b672 subpackages: - discovery - kubernetes @@ -303,7 +305,6 @@ imports: - pkg/util/net - pkg/util/parsers - pkg/util/rand - - pkg/util/ratelimit - pkg/util/runtime - pkg/util/sets - pkg/util/uuid diff --git a/glide.yaml b/glide.yaml index d12a0c5..3a15925 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,13 +1,5 @@ package: github.com/k8guard/k8guard-discover import: -- package: k8s.io/client-go - version: =v2.0.0-alpha.1 - subpackages: - - kubernetes - - pkg/api - - rest - - tools/clientcmd - - package: github.com/pressly/chi version: b206b0359be0c971fbfab2aa15307482f9c300f4 repo: https://github.com/pressly/chi.git @@ -32,6 +24,6 @@ import: - prometheus/promhttp - package: github.com/k8guard/k8guardlibs - repo: https://github.com/k8guard/k8guardlibs.git - version: 0558b3eafb02f616ee743b4ecfd93451ba2d33e1 + repo: git@git.target.com:medyagh/k8guardlibs.git + version: 3a98e5183df76e742cc564dd6489693ba6b50988 vcs: git From f9f4fdbd74fdc892f0cc80c65b9fee5bcedc3275 Mon Sep 17 00:00:00 2001 From: medyagh Date: Mon, 22 May 2017 11:04:49 -0500 Subject: [PATCH 2/2] glide update --- glide.lock | 13 ++++++------- glide.yaml | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/glide.lock b/glide.lock index 3cf6970..2b3f66c 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: aad5006fc5c96cd5c4d180042c44c920987224a958024f9d58e43b7bc9b82e41 -updated: 2017-05-19T16:29:30.999345684-05:00 +hash: 0c62fd9e75dd3638fd370fffd54562cf29799e252333fab023be907fc9edbb91 +updated: 2017-05-22T11:01:01.205637863-05:00 imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 @@ -87,11 +87,9 @@ imports: version: 6633656539c1639d9d78127b7d47c622b5d7b6dc - name: github.com/jonboulle/clockwork version: 72f9bd7c4e0c2a40055ab3d0f09654f730cce982 -- name: github.com/juju/ratelimit - version: 77ed1c8a01217656d2080ad51981f6e99adaa177 - name: github.com/k8guard/k8guardlibs - version: 3a98e5183df76e742cc564dd6489693ba6b50988 - repo: git@git.target.com:medyagh/k8guardlibs.git + version: 0558b3eafb02f616ee743b4ecfd93451ba2d33e1 + repo: https://github.com/k8guard/k8guardlibs.git vcs: git subpackages: - config @@ -214,7 +212,7 @@ imports: - name: gopkg.in/yaml.v2 version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 - name: k8s.io/client-go - version: e121606b0d09b2e1c467183ee46217fa85a6b672 + version: d81cb85237595f720d83eda492bae8f6162fc5c0 subpackages: - discovery - kubernetes @@ -305,6 +303,7 @@ imports: - pkg/util/net - pkg/util/parsers - pkg/util/rand + - pkg/util/ratelimit - pkg/util/runtime - pkg/util/sets - pkg/util/uuid diff --git a/glide.yaml b/glide.yaml index 3a15925..42d1c79 100644 --- a/glide.yaml +++ b/glide.yaml @@ -24,6 +24,6 @@ import: - prometheus/promhttp - package: github.com/k8guard/k8guardlibs - repo: git@git.target.com:medyagh/k8guardlibs.git - version: 3a98e5183df76e742cc564dd6489693ba6b50988 + repo: https://github.com/k8guard/k8guardlibs.git + version: 0558b3eafb02f616ee743b4ecfd93451ba2d33e1 vcs: git