diff options
| -rw-r--r-- | maintainers/maintainer-list.nix | 5 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1809.xml | 12 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f001ba6be8d..92a4a6e8b41 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1864,6 +1864,11 @@ email = "me@joelt.io"; name = "Joel Taylor"; }; + johanot = { + email = "write@ownrisk.dk"; + github = "johanot"; + name = "Johan Thomsen"; + }; johbo = { email = "johannes@bornhold.name"; github = "johbo"; diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 0ae630945db..35dc69515ff 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -241,6 +241,18 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <literal>networking.networkmanager.dns</literal> instead. </para> </listitem> + <listitem> + <para> + The option <varname>services.kubernetes.apiserver.admissionControl</varname> + was renamed to <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>. + </para> + </listitem> + <listitem> + <para> + Recommented way to access the Kubernetes Dashboard is with HTTPS (TLS) + Therefore; public service port for the dashboard has changed to 443 (container port 8443) and scheme to https. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 68f281bf004..65fd22cdf47 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "1la9cdf5a67kg72xn4bn5mib1caiv5vxsjmnxqsmx0m7vhbv5i4n"; }; - # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60597 + # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ]; outputs = ["out" "man" "pause"]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; homepage = https://kubernetes.io; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [johanot offline]; platforms = platforms.unix; }; } |