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.

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

Canal v3.7.4 #7206

Merged
merged 1 commit into from Jul 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,8 +1,8 @@
# Canal Version v3.7.3
# https://docs.projectcalico.org/v3.7/release-notes/#v373
# Canal Version v3.7.4
# https://docs.projectcalico.org/v3.7/release-notes/#v374
# This manifest includes the following component versions:
# calico/node:v3.7.3
# calico/cni:v3.7.3
# calico/node:v3.7.4
# calico/cni:v3.7.4
# coreos/flannel:v0.11.0

# Source: calico/templates/calico-config.yaml
Expand Down Expand Up @@ -411,7 +411,7 @@ spec:
# This container installs the Calico CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: calico/cni:v3.7.3
image: calico/cni:v3.7.4
command: ["/install-cni.sh"]
env:
# Name of the CNI config file to create.
Expand Down Expand Up @@ -447,7 +447,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: calico/node:v3.7.3
image: calico/node:v3.7.4
env:
# Use Kubernetes API as the backing datastore.
- name: DATASTORE_TYPE
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
Expand Up @@ -913,7 +913,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
"k8s-1.6": "2.4.2-kops.2",
"k8s-1.8": "2.6.7-kops.3",
"k8s-1.9": "3.2.3-kops.1",
"k8s-1.12": "3.7.3",
"k8s-1.12": "3.7.4",
}
{
id := "pre-k8s-1.6"
Expand Down