diff --git a/upup/models/bindata.go b/upup/models/bindata.go index d1fbe47ae503c..9fdd96336a46c 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -6429,7 +6429,7 @@ func cloudupResourcesAddonsNetworkingKopeIoK8s16Yaml() (*asset, error) { return a, nil } -var _cloudupResourcesAddonsNetworkingKuberouterK8s112YamlTemplate = []byte(`# Pulled and modified from https://raw.githubusercontent.com/cloudnativelabs/kube-router/v1.0.0/daemonset/kubeadm-kuberouter.yaml +var _cloudupResourcesAddonsNetworkingKuberouterK8s112YamlTemplate = []byte(`# Pulled and modified from https://raw.githubusercontent.com/cloudnativelabs/kube-router/v1.0.1/daemonset/kubeadm-kuberouter.yaml apiVersion: v1 kind: ConfigMap @@ -6453,6 +6453,13 @@ data: "ipam":{ "type":"host-local" } + }, + { + "type": "portmap", + "capabilities": { + "snat": true, + "portMappings": true + } } ] } @@ -6480,11 +6487,12 @@ spec: serviceAccountName: kube-router containers: - name: kube-router - image: docker.io/cloudnativelabs/kube-router:v1.0.0 + image: docker.io/cloudnativelabs/kube-router:v1.0.1 args: - --run-router=true - --run-firewall=true - --run-service-proxy=true + - --bgp-graceful-restart=true - --kubeconfig=/var/lib/kube-router/kubeconfig - --metrics-port=12013 env: @@ -6520,7 +6528,7 @@ spec: readOnly: false initContainers: - name: install-cni - image: docker.io/cloudnativelabs/kube-router:v1.0.0 + image: docker.io/cloudnativelabs/kube-router:v1.0.1 command: - /bin/sh - -c diff --git a/upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template index 714570fb395cd..239b6c516976b 100644 --- a/upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template @@ -1,4 +1,4 @@ -# Pulled and modified from https://raw.githubusercontent.com/cloudnativelabs/kube-router/v1.0.0/daemonset/kubeadm-kuberouter.yaml +# Pulled and modified from https://raw.githubusercontent.com/cloudnativelabs/kube-router/v1.0.1/daemonset/kubeadm-kuberouter.yaml apiVersion: v1 kind: ConfigMap @@ -22,6 +22,13 @@ data: "ipam":{ "type":"host-local" } + }, + { + "type": "portmap", + "capabilities": { + "snat": true, + "portMappings": true + } } ] } @@ -49,11 +56,12 @@ spec: serviceAccountName: kube-router containers: - name: kube-router - image: docker.io/cloudnativelabs/kube-router:v1.0.0 + image: docker.io/cloudnativelabs/kube-router:v1.0.1 args: - --run-router=true - --run-firewall=true - --run-service-proxy=true + - --bgp-graceful-restart=true - --kubeconfig=/var/lib/kube-router/kubeconfig - --metrics-port=12013 env: @@ -89,7 +97,7 @@ spec: readOnly: false initContainers: - name: install-cni - image: docker.io/cloudnativelabs/kube-router:v1.0.0 + image: docker.io/cloudnativelabs/kube-router:v1.0.1 command: - /bin/sh - -c diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 7af5daed368d1..f840bbec5dab3 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -854,7 +854,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { key := "networking.kuberouter" versions := map[string]string{ "k8s-1.6": "0.3.1-kops.4", - "k8s-1.12": "1.0.0-kops.2", + "k8s-1.12": "1.0.1-kops.1", } {