Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing changes in Weave manifest #8965

Merged
merged 1 commit into from
Apr 28, 2020
Merged

Fix missing changes in Weave manifest #8965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions upup/models/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ rules:
- get
- list
- watch
- apiGroups:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does weave actually fetch resources using the deprecated api groups? If not, this is not necessary. It doesn't do any harm either though.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Best to keep it as close as possible to their official manifest, I guess. Thanks for checking this.
https://github.com/weaveworks/weave/blob/9f00f78d3b9d5a8a31fdd90ec691095028e2690a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml#L28-L35

- extensions
resources:
- networkpolicies
verbs:
- get
- list
- watch
- apiGroups:
- 'networking.k8s.io'
resources:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -205,7 +212,6 @@ spec:
mountPath: /run/xtables.lock
readOnly: false
- name: weave-npc
args: []
env:
- name: HOSTNAME
valueFrom:
Expand Down Expand Up @@ -245,6 +251,8 @@ spec:
tolerations:
- effect: NoSchedule
operator: Exists
- effect: NoExecute
operator: Exists
- key: CriticalAddonsOnly
operator: Exists
volumes:
Expand Down
11 changes: 10 additions & 1 deletion upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ rules:
- get
- list
- watch
- apiGroups:
- extensions
resources:
- networkpolicies
verbs:
- get
- list
- watch
- apiGroups:
- 'networking.k8s.io'
resources:
Expand Down Expand Up @@ -201,7 +209,6 @@ spec:
mountPath: /run/xtables.lock
readOnly: false
- name: weave-npc
args: []
env:
- name: HOSTNAME
valueFrom:
Expand Down Expand Up @@ -240,6 +247,8 @@ spec:
tolerations:
- effect: NoSchedule
operator: Exists
- effect: NoExecute
operator: Exists
- key: CriticalAddonsOnly
operator: Exists
volumes:
Expand Down
4 changes: 2 additions & 2 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}

{
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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