Merge pull request #57 from weaveworks/support-k8s-1.13

Support k8s 1.13
This commit is contained in:
Adam Harrison
2019-05-16 10:55:59 +01:00
committed by GitHub
4 changed files with 42 additions and 39 deletions
Generated
+38 -36
View File
@@ -7,26 +7,14 @@
packages = ["quantile"]
revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
[[projects]]
name = "github.com/ghodss/yaml"
packages = ["."]
revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
version = "v1.0.0"
[[projects]]
name = "github.com/gogo/protobuf"
packages = [
"proto",
"sortkeys"
]
revision = "636bf0302bc95575d69441b25a2603156ffdddf1"
version = "v1.1.1"
[[projects]]
branch = "master"
name = "github.com/golang/glog"
packages = ["."]
revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"
revision = "4cbf7e384e768b4e01799441fdf2a706a5635ae7"
version = "v1.2.0"
[[projects]]
name = "github.com/golang/protobuf"
@@ -69,7 +57,7 @@
".",
"diskcache"
]
revision = "9cad4c3443a7200dd6400aef47183728de563a38"
revision = "c63ab54fda8f77302f8d414e19933f2b6026a089"
[[projects]]
name = "github.com/inconshreveable/mousetrap"
@@ -129,7 +117,7 @@
"prometheus/internal",
"prometheus/promhttp"
]
revision = "16f375c74db6ccf880e1cd9c6c6087a6d58e5d12"
revision = "fb3d5cb2ad5789367093b409855a3937d651b572"
[[projects]]
branch = "master"
@@ -145,7 +133,7 @@
"internal/bitbucket.org/ww/goautoneg",
"model"
]
revision = "7e9e6cabbd393fc208072eedef99188d0ce788b6"
revision = "67670fe90761d7ff18ec1d640135e53b9198328f"
[[projects]]
branch = "master"
@@ -156,19 +144,19 @@
"nfs",
"xfs"
]
revision = "185b4288413d2a0dd0806f78c90dde719829e5ae"
revision = "14fa7590c24d4615893b68e22fce3b3489689f65"
[[projects]]
name = "github.com/sirupsen/logrus"
packages = ["."]
revision = "ad15b42461921f1fb3529b058c6786c6a45d5162"
version = "v1.1.1"
revision = "bcd833dfe83d3cebad139e4a29ed79cb2318bf95"
version = "v1.2.0"
[[projects]]
branch = "master"
name = "github.com/spf13/cobra"
packages = ["."]
revision = "fe5e611709b0c57fa4a89136deaa8e1d4004d053"
revision = "d2d81d9a96e23f0255397222bb0b4e3165e492dc"
[[projects]]
name = "github.com/spf13/pflag"
@@ -180,7 +168,7 @@
branch = "master"
name = "golang.org/x/crypto"
packages = ["ssh/terminal"]
revision = "85e1b3f9139abd58575d728a509643924e3b2ebf"
revision = "8d7daa0c54b357f3071e11eaef7efc4e19a417e2"
[[projects]]
branch = "master"
@@ -193,7 +181,7 @@
"http2/hpack",
"idna"
]
revision = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344"
revision = "927f97764cc334a6575f4b7a1584a147864d5723"
[[projects]]
branch = "master"
@@ -202,7 +190,7 @@
".",
"internal"
]
revision = "9dcd33a902f40452422c2367fefcb95b54f9f8f8"
revision = "d668ce993890a79bda886613ee587a69dd5da7a6"
[[projects]]
branch = "master"
@@ -211,7 +199,7 @@
"unix",
"windows"
]
revision = "d989b31c87461dc8ab2f1cac6792814e27fadea9"
revision = "82a175fd1598e8a172e58ebdf5ed262bb29129e5"
[[projects]]
name = "golang.org/x/text"
@@ -238,7 +226,7 @@
branch = "master"
name = "golang.org/x/time"
packages = ["rate"]
revision = "fbb02b2291d28baffd63558aa44b4b56f178d650"
revision = "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd"
[[projects]]
name = "google.golang.org/appengine"
@@ -251,8 +239,8 @@
"internal/urlfetch",
"urlfetch"
]
revision = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06"
version = "v1.2.0"
revision = "e9657d882bb81064595ca3b56cbe2546bbabf7b1"
version = "v1.4.0"
[[projects]]
name = "gopkg.in/inf.v0"
@@ -263,8 +251,8 @@
[[projects]]
name = "gopkg.in/yaml.v2"
packages = ["."]
revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
version = "v2.2.1"
revision = "51d6538a90f86fe93ac480b35f37b2be17fef232"
version = "v2.2.2"
[[projects]]
branch = "master"
@@ -275,6 +263,7 @@
"apps/v1",
"apps/v1beta1",
"apps/v1beta2",
"auditregistration/v1alpha1",
"authentication/v1",
"authentication/v1beta1",
"authorization/v1",
@@ -302,10 +291,10 @@
"storage/v1alpha1",
"storage/v1beta1"
]
revision = "843ad2d9b9ae703c74f2f43959e6ce0b24cc3185"
revision = "173ce66c1e39d1d0f56e0b3347ff2988068aecd0"
[[projects]]
branch = "release-1.12"
branch = "release-1.13"
name = "k8s.io/apimachinery"
packages = [
"pkg/api/errors",
@@ -344,7 +333,7 @@
"pkg/watch",
"third_party/forked/golang/reflect"
]
revision = "6dd46049f39503a1fc8d65de4bd566829e95faff"
revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd"
[[projects]]
name = "k8s.io/client-go"
@@ -357,6 +346,7 @@
"kubernetes/typed/apps/v1",
"kubernetes/typed/apps/v1beta1",
"kubernetes/typed/apps/v1beta2",
"kubernetes/typed/auditregistration/v1alpha1",
"kubernetes/typed/authentication/v1",
"kubernetes/typed/authentication/v1beta1",
"kubernetes/typed/authorization/v1",
@@ -399,12 +389,24 @@
"util/flowcontrol",
"util/integer"
]
revision = "1638f8970cefaa404ff3a62950f88b08292b2696"
version = "v9.0.0"
revision = "e64494209f554a6723674bd494d69445fb76a1d4"
version = "v10.0.0"
[[projects]]
name = "k8s.io/klog"
packages = ["."]
revision = "a5bc97fbc634d635061f3146511332c7e313a55a"
version = "v0.1.0"
[[projects]]
name = "sigs.k8s.io/yaml"
packages = ["."]
revision = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480"
version = "v1.1.0"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "76687ace1736ad6f237f5bdc9ad6c82e82906a7098a5c61211676c61e5b088a0"
inputs-digest = "96704623ac96e94ce47b0820b4ff9e359b76c68a72eb83621a3de9d99d3d9d4f"
solver-name = "gps-cdcl"
solver-version = 1
+2 -2
View File
@@ -16,11 +16,11 @@
[[constraint]]
name = "k8s.io/client-go"
version = "v9.0.0"
version = "v10.0.0"
[[constraint]]
name = "k8s.io/apimachinery"
branch = "release-1.12"
branch = "release-1.13"
[prune]
go-tests = true
+1
View File
@@ -40,6 +40,7 @@ compatibility of one minor version between client and server:
| kured | kubectl | k8s.io/client-go | k8s.io/apimachinery | expected kubernetes compatibility |
|--------|---------|------------------|---------------------|-----------------------------------|
| master | 1.13.1 | v10.0.0 | release-1.13 | 1.12.x, 1.13.x, 1.14.x |
| 1.1.0 | 1.12.1 | v9.0.0 | release-1.12 | 1.11.x, 1.12.x, 1.13.x |
| 1.0.0 | 1.7.6 | v4.0.0 | release-1.7 | 1.6.x, 1.7.x, 1.8.x |
+1 -1
View File
@@ -1,7 +1,7 @@
FROM alpine:3.8
RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
# NB: you may need to update RBAC permissions when upgrading kubectl - see kured-rbac.yaml for details
ADD https://storage.googleapis.com/kubernetes-release/release/v1.12.1/bin/linux/amd64/kubectl /usr/bin/kubectl
ADD https://storage.googleapis.com/kubernetes-release/release/v1.13.6/bin/linux/amd64/kubectl /usr/bin/kubectl
RUN chmod 0755 /usr/bin/kubectl
COPY ./kured /usr/bin/kured
ENTRYPOINT ["/usr/bin/kured"]