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
683efbb7
Commit
683efbb7
authored
Jan 14, 2022
by
Brad Davidson
Committed by
Brad Davidson
Jan 18, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update packaged components
Update images and manifests/charts for coredns, local-path-provisioner, traefik, and pause Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
f856aa94
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
14 deletions
+13
-14
coredns.yaml
manifests/coredns.yaml
+1
-1
local-storage.yaml
manifests/local-storage.yaml
+2
-2
traefik.yaml
manifests/traefik.yaml
+3
-3
agent.go
pkg/cli/cmds/agent.go
+1
-1
image-list.txt
scripts/airgap/image-list.txt
+5
-6
volume-test.yaml
scripts/airgap/volume-test.yaml
+1
-1
No files found.
manifests/coredns.yaml
View file @
683efbb7
...
@@ -111,7 +111,7 @@ spec:
...
@@ -111,7 +111,7 @@ spec:
beta.kubernetes.io/os
:
linux
beta.kubernetes.io/os
:
linux
containers
:
containers
:
-
name
:
coredns
-
name
:
coredns
image
:
%
{
SYSTEM_DEFAULT_REGISTRY
}
%
rancher/
coredns-coredns:1.8.3
image
:
%
{
SYSTEM_DEFAULT_REGISTRY
}
%
rancher/
mirrored-coredns-coredns:1.8.6
imagePullPolicy
:
IfNotPresent
imagePullPolicy
:
IfNotPresent
resources
:
resources
:
limits
:
limits
:
...
...
manifests/local-storage.yaml
View file @
683efbb7
...
@@ -63,7 +63,7 @@ spec:
...
@@ -63,7 +63,7 @@ spec:
effect
:
"
NoSchedule"
effect
:
"
NoSchedule"
containers
:
containers
:
-
name
:
local-path-provisioner
-
name
:
local-path-provisioner
image
:
%
{
SYSTEM_DEFAULT_REGISTRY
}
%
rancher/local-path-provisioner:v0.0.
19
image
:
%
{
SYSTEM_DEFAULT_REGISTRY
}
%
rancher/local-path-provisioner:v0.0.
21
imagePullPolicy
:
IfNotPresent
imagePullPolicy
:
IfNotPresent
command
:
command
:
-
local-path-provisioner
-
local-path-provisioner
...
@@ -151,4 +151,4 @@ data:
...
@@ -151,4 +151,4 @@ data:
spec:
spec:
containers:
containers:
- name: helper-pod
- name: helper-pod
image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/
library-busybox:1.32
.1
image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/
mirrored-library-busybox:1.34
.1
manifests/traefik.yaml
View file @
683efbb7
...
@@ -4,7 +4,7 @@ metadata:
...
@@ -4,7 +4,7 @@ metadata:
name
:
traefik-crd
name
:
traefik-crd
namespace
:
kube-system
namespace
:
kube-system
spec
:
spec
:
chart
:
https://%{KUBERNETES_API}%/static/charts/traefik-crd-
9.18.201
.tgz
chart
:
https://%{KUBERNETES_API}%/static/charts/traefik-crd-
10.9.100
.tgz
---
---
apiVersion
:
helm.cattle.io/v1
apiVersion
:
helm.cattle.io/v1
kind
:
HelmChart
kind
:
HelmChart
...
@@ -12,7 +12,7 @@ metadata:
...
@@ -12,7 +12,7 @@ metadata:
name
:
traefik
name
:
traefik
namespace
:
kube-system
namespace
:
kube-system
spec
:
spec
:
chart
:
https://%{KUBERNETES_API}%/static/charts/traefik-
9.18.201
.tgz
chart
:
https://%{KUBERNETES_API}%/static/charts/traefik-
10.9.100
.tgz
set
:
set
:
global.systemDefaultRegistry
:
"
%{SYSTEM_DEFAULT_REGISTRY_RAW}%"
global.systemDefaultRegistry
:
"
%{SYSTEM_DEFAULT_REGISTRY_RAW}%"
valuesContent
:
|-
valuesContent
:
|-
...
@@ -31,7 +31,7 @@ spec:
...
@@ -31,7 +31,7 @@ spec:
enabled: true
enabled: true
priorityClassName: "system-cluster-critical"
priorityClassName: "system-cluster-critical"
image:
image:
name: "rancher/library-traefik"
name: "rancher/
mirrored-
library-traefik"
tolerations:
tolerations:
- key: "CriticalAddonsOnly"
- key: "CriticalAddonsOnly"
operator: "Exists"
operator: "Exists"
...
...
pkg/cli/cmds/agent.go
View file @
683efbb7
...
@@ -111,7 +111,7 @@ var (
...
@@ -111,7 +111,7 @@ var (
Name
:
"pause-image"
,
Name
:
"pause-image"
,
Usage
:
"(agent/runtime) Customized pause image for containerd or docker sandbox"
,
Usage
:
"(agent/runtime) Customized pause image for containerd or docker sandbox"
,
Destination
:
&
AgentConfig
.
PauseImage
,
Destination
:
&
AgentConfig
.
PauseImage
,
Value
:
"rancher/
pause:3.1
"
,
Value
:
"rancher/
mirrored-pause:3.5
"
,
}
}
SnapshotterFlag
=
cli
.
StringFlag
{
SnapshotterFlag
=
cli
.
StringFlag
{
Name
:
"snapshotter"
,
Name
:
"snapshotter"
,
...
...
scripts/airgap/image-list.txt
View file @
683efbb7
docker.io/rancher/coredns-coredns:1.8.3
docker.io/rancher/klipper-helm:v0.6.6-build20211022
docker.io/rancher/klipper-helm:v0.6.6-build20211022
docker.io/rancher/klipper-lb:v0.3.4
docker.io/rancher/klipper-lb:v0.3.4
docker.io/rancher/library-busybox:1.32.1
docker.io/rancher/local-path-provisioner:v0.0.21
docker.io/rancher/library-traefik:2.4.8
docker.io/rancher/mirrored-coredns-coredns:1.8.6
docker.io/rancher/local-path-provisioner:v0.0.19
docker.io/rancher/mirrored-library-busybox:1.34.1
docker.io/rancher/mirrored-library-traefik:2.5.6
docker.io/rancher/mirrored-metrics-server:v0.5.2
docker.io/rancher/mirrored-metrics-server:v0.5.2
docker.io/rancher/pause:3.1
docker.io/rancher/mirrored-pause:3.5
scripts/airgap/volume-test.yaml
View file @
683efbb7
...
@@ -19,7 +19,7 @@ metadata:
...
@@ -19,7 +19,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
volume-test
-
name
:
volume-test
image
:
rancher/
pause:3.1
image
:
rancher/
mirrored-pause:3.5
imagePullPolicy
:
IfNotPresent
imagePullPolicy
:
IfNotPresent
volumeMounts
:
volumeMounts
:
-
name
:
volv
-
name
:
volv
...
...
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