diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template index 9acef13eb4f99..0e3ec1f77ebb7 100644 --- a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template @@ -36,6 +36,14 @@ rules: - get - list - watch + - apiGroups: + - extensions + resources: + - networkpolicies + verbs: + - get + - list + - watch - apiGroups: - 'networking.k8s.io' resources: @@ -131,7 +139,6 @@ spec: role.kubernetes.io/networking: "1" annotations: prometheus.io/scrape: "true" - scheduler.alpha.kubernetes.io/critical-pod: '' spec: containers: - name: weave @@ -205,7 +212,6 @@ spec: mountPath: /run/xtables.lock readOnly: false - name: weave-npc - args: [] env: - name: HOSTNAME valueFrom: @@ -245,6 +251,8 @@ spec: tolerations: - effect: NoSchedule operator: Exists + - effect: NoExecute + operator: Exists - key: CriticalAddonsOnly operator: Exists volumes: diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template index 993473562f018..b88e4f2a640d8 100644 --- a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template @@ -36,6 +36,14 @@ rules: - get - list - watch + - apiGroups: + - extensions + resources: + - networkpolicies + verbs: + - get + - list + - watch - apiGroups: - 'networking.k8s.io' resources: @@ -201,7 +209,6 @@ spec: mountPath: /run/xtables.lock readOnly: false - name: weave-npc - args: [] env: - name: HOSTNAME valueFrom: @@ -240,6 +247,8 @@ spec: tolerations: - effect: NoSchedule operator: Exists + - effect: NoExecute + operator: Exists - key: CriticalAddonsOnly operator: Exists volumes: diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 24405dc0396e0..5f4da6885aeb1 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -651,8 +651,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { if b.cluster.Spec.Networking.Weave != nil { key := "networking.weave" versions := map[string]string{ - "k8s-1.8": "2.6.2-kops.1", - "k8s-1.12": "2.6.2-kops.1", + "k8s-1.8": "2.6.2-kops.2", + "k8s-1.12": "2.6.2-kops.2", } { diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index 5b9e195bb07d1..959dc8a549625 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -89,16 +89,16 @@ spec: - id: k8s-1.8 kubernetesVersion: <1.12.0 manifest: networking.weave/k8s-1.8.yaml - manifestHash: 23511c3485517049f5b90ce365a3e329509194ee + manifestHash: 6d1820c37afaee6423b9d16cfbc45fcca281b18f name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.6.2-kops.1 + version: 2.6.2-kops.2 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: networking.weave/k8s-1.12.yaml - manifestHash: 5c6202bc41043a72cb78ade6c761ccaf183bd36c + manifestHash: 103cd60b880d9bab489b80c81a307a60a8328c69 name: networking.weave selector: role.kubernetes.io/networking: "1" - version: 2.6.2-kops.1 + version: 2.6.2-kops.2