kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8965 from hakman/weave-fixes 

Fix missing changes in Weave manifest
This commit is contained in:
Kubernetes Prow Robot 2020-04-28 08:20:09 -07:00 committed by GitHub
parent f00e538bfd 227a767ce5
commit 0adf32f973
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
upup/models/bindata.go
View File

@ -14181,6 +14181,14 @@ rules:
- get
- list
- watch
- apiGroups:
- extensions
resources:
- networkpolicies
verbs:
- get
- list
- watch
- apiGroups:
- 'networking.k8s.io'
resources:
@ -14276,7 +14284,6 @@ spec:
role.kubernetes.io/networking: "1"
annotations:
prometheus.io/scrape: "true"
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
containers:
- name: weave
@ -14350,7 +14357,6 @@ spec:
mountPath: /run/xtables.lock
readOnly: false
- name: weave-npc
args: []
env:
- name: HOSTNAME
valueFrom:
@ -14390,6 +14396,8 @@ spec:
tolerations:
- effect: NoSchedule
operator: Exists
- effect: NoExecute
operator: Exists
- key: CriticalAddonsOnly
operator: Exists
volumes:
@ -14473,6 +14481,14 @@ rules:
- get
- list
- watch
- apiGroups:
- extensions
resources:
- networkpolicies
verbs:
- get
- list
- watch
- apiGroups:
- 'networking.k8s.io'
resources:
@ -14638,7 +14654,6 @@ spec:
mountPath: /run/xtables.lock
readOnly: false
- name: weave-npc
args: []
env:
- name: HOSTNAME
valueFrom:
@ -14677,6 +14692,8 @@ spec:
tolerations:
- effect: NoSchedule
operator: Exists
- effect: NoExecute
operator: Exists
- key: CriticalAddonsOnly
operator: Exists
volumes:

12
upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
View File

@ -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:

11
upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template
View File

@ -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:

4
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -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",
}
{

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -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