Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
0bd41187
Commit
0bd41187
authored
Jul 11, 2016
by
Minhan Xia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bump cni version
parent
f6d7e5c6
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
9 deletions
+9
-9
master-docker.yaml
cluster/gce/coreos/master-docker.yaml
+1
-1
master-rkt.yaml
cluster/gce/coreos/master-rkt.yaml
+1
-1
node-docker.yaml
cluster/gce/coreos/node-docker.yaml
+1
-1
node-rkt.yaml
cluster/gce/coreos/node-rkt.yaml
+1
-1
configure.sh
cluster/gce/gci/configure.sh
+1
-1
Makefile
cluster/images/hyperkube/Makefile
+1
-1
init.sls
cluster/saltbase/salt/cni/init.sls
+2
-2
e2e_remote.go
test/e2e_node/e2e_remote.go
+1
-1
No files found.
cluster/gce/coreos/master-docker.yaml
View file @
0bd41187
...
...
@@ -35,7 +35,7 @@ coreos:
Type=oneshot
RemainAfterExit=yes
ExecStartPre=/usr/bin/mkdir -p /opt/cni
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
c864f0e1ea73719b8f4582402b0847064f9883b0
.tar.gz
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
8a936732094c0941e1543ef5d292a1f4fffa1ac5
.tar.gz
ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/
-
name
:
kubernetes-download-salt.service
...
...
cluster/gce/coreos/master-rkt.yaml
View file @
0bd41187
...
...
@@ -35,7 +35,7 @@ coreos:
Type=oneshot
RemainAfterExit=yes
ExecStartPre=/usr/bin/mkdir -p /opt/cni
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
c864f0e1ea73719b8f4582402b0847064f9883b0
.tar.gz
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
8a936732094c0941e1543ef5d292a1f4fffa1ac5
.tar.gz
ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/
-
name
:
kubernetes-install-docker2aci.service
...
...
cluster/gce/coreos/node-docker.yaml
View file @
0bd41187
...
...
@@ -35,7 +35,7 @@ coreos:
Type=oneshot
RemainAfterExit=yes
ExecStartPre=/usr/bin/mkdir -p /opt/cni
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
c864f0e1ea73719b8f4582402b0847064f9883b0
.tar.gz
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
8a936732094c0941e1543ef5d292a1f4fffa1ac5
.tar.gz
ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/
-
name
:
kubernetes-download-manifests.service
...
...
cluster/gce/coreos/node-rkt.yaml
View file @
0bd41187
...
...
@@ -35,7 +35,7 @@ coreos:
Type=oneshot
RemainAfterExit=yes
ExecStartPre=/usr/bin/mkdir -p /opt/cni
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
c864f0e1ea73719b8f4582402b0847064f9883b0
.tar.gz
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
8a936732094c0941e1543ef5d292a1f4fffa1ac5
.tar.gz
ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/
-
name
:
kubernetes-install-rkt.service
...
...
cluster/gce/gci/configure.sh
View file @
0bd41187
...
...
@@ -149,7 +149,7 @@ function install-kube-binary-config {
if
[[
"
${
NETWORK_PROVIDER
:-}
"
==
"kubenet"
]]
||
\
[[
"
${
NETWORK_PROVIDER
:-}
"
==
"cni"
]]
;
then
#TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
local
-r
cni_tar
=
"cni-
26b61728ac940c3faf827927782326e921be17b0
.tar.gz"
local
-r
cni_tar
=
"cni-
8a936732094c0941e1543ef5d292a1f4fffa1ac5
.tar.gz"
download-or-bust
""
"https://storage.googleapis.com/kubernetes-release/network-plugins/
${
cni_tar
}
"
tar
xzf
"
${
KUBE_HOME
}
/
${
cni_tar
}
"
-C
"
${
kube_bin
}
"
--overwrite
mv
"
${
kube_bin
}
/bin"
/
*
"
${
kube_bin
}
"
...
...
cluster/images/hyperkube/Makefile
View file @
0bd41187
...
...
@@ -20,7 +20,7 @@
REGISTRY
?=
gcr.io/google_containers
ARCH
?=
amd64
TEMP_DIR
:=
$(
shell
mktemp
-d
)
CNI_RELEASE
=
c864f0e1ea73719b8f4582402b0847064f9883b0
CNI_RELEASE
=
8a936732094c0941e1543ef5d292a1f4fffa1ac5
UNAME_S
:=
$(
shell
uname
-s
)
ifeq
($(UNAME_S),Darwin)
...
...
cluster/saltbase/salt/cni/init.sls
View file @
0bd41187
...
...
@@ -19,9 +19,9 @@ cni-tar:
- user: root
- name: /opt/cni
- makedirs: True
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
c864f0e1ea73719b8f4582402b0847064f9883b0
.tar.gz
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-
8a936732094c0941e1543ef5d292a1f4fffa1ac5
.tar.gz
- tar_options: v
- source_hash: md5=
5f71ea8046930357e0ca83088064db9
3
- source_hash: md5=
ae7ec24d2ffc0fd14a15f527744ba2c
3
- archive_format: tar
- if_missing: /opt/cni/bin
...
...
test/e2e_node/e2e_remote.go
View file @
0bd41187
...
...
@@ -42,7 +42,7 @@ var sshOptionsMap map[string]string
const
(
archiveName
=
"e2e_node_test.tar.gz"
CNIRelease
=
"
c864f0e1ea73719b8f4582402b0847064f9883b0
"
CNIRelease
=
"
8a936732094c0941e1543ef5d292a1f4fffa1ac5
"
CNIDirectory
=
"cni"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment