Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1118 from guangbochen/pause-img

Browse Source 
Update base pause image to rancher repo
This commit is contained in:
Erik Wilson 2019-11-26 09:44:27 -07:00 committed by GitHub
commit ecb40c051b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/agent/templates/templates.go
View File

@ -29,6 +29,8 @@ const ContainerdConfigTemplate = `
{{- if .NodeConfig.AgentConfig.PauseImage }} {{- if .NodeConfig.AgentConfig.PauseImage }}
sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}" sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}"
{{else}}
sandbox_image = "docker.io/rancher/pause:3.1"
{{end}} {{end}}
{{- if not .NodeConfig.NoFlannel }} {{- if not .NodeConfig.NoFlannel }}

2
scripts/airgap/image-list.txt
View File

@ -4,4 +4,4 @@ docker.io/rancher/klipper-helm:v0.1.5
docker.io/rancher/klipper-lb:v0.1.2 docker.io/rancher/klipper-lb:v0.1.2
docker.io/rancher/local-path-provisioner:v0.0.11 docker.io/rancher/local-path-provisioner:v0.0.11
docker.io/rancher/metrics-server:v0.3.6 docker.io/rancher/metrics-server:v0.3.6
k8s.gcr.io/pause:3.1 docker.io/rancher/pause:3.1