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

Jump to bottom

Calico: upgrade pod2daemon (only) #7689

Merged
merged 2 commits into from
Sep 27, 2019
Merged

Calico: upgrade pod2daemon (only) #7689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba76db7
Limit calico cpu request to 100m
justinsb Sep 27, 2019
70dd5c3
Calico: upgrade pod2daemon (only)
justinsb Sep 27, 2019
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
2 changes: 1 addition & 1 deletion ...models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ spec:
privileged: true
resources:
requests:
cpu: 250m
cpu: 100m
livenessProbe:
httpGet:
path: /liveness
Expand Down
5 changes: 3 additions & 2 deletions upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,8 @@ spec:
# Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
# to communicate with Felix over the Policy Sync API.
- name: flexvol-driver
image: calico/pod2daemon-flexvol:v3.8.2
# We bump this to v3.9.1 to pick up https://github.com/projectcalico/pod2daemon/pull/28
image: calico/pod2daemon-flexvol:v3.9.1
volumeMounts:
- name: flexvol-driver-host
mountPath: /host/driver
Expand Down Expand Up @@ -820,7 +821,7 @@ spec:
privileged: true
resources:
requests:
cpu: 250m
cpu: 90m
livenessProbe:
httpGet:
path: /liveness
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
"k8s-1.6": "2.6.9-kops.1",
"k8s-1.7": "2.6.12-kops.1",
"k8s-1.7-v3": "3.8.0-kops.1",
"k8s-1.12": "3.8.2-kops.1",
"k8s-1.12": "3.8.2-kops.3",
}

{
Expand Down