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
bb7c2598
Commit
bb7c2598
authored
May 14, 2018
by
Bowei Du
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cherrypick: Enable CUSTOM_INGRESS_YAML to replace the glbc manifest
This allows for customized versions of the Ingress YAML separate from stock Kubernetes.
parent
42b63c8b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+12
-4
No files found.
cluster/gce/gci/configure-helper.sh
View file @
bb7c2598
...
...
@@ -2370,11 +2370,19 @@ function start-lb-controller {
prepare-log-file /var/log/glbc.log
setup-addon-manifests
"addons"
"cluster-loadbalancing/glbc"
local
-r
glbc_manifest
=
"
${
KUBE_HOME
}
/kube-manifests/kubernetes/gci-trusty/glbc.manifest"
if
[[
!
-z
"
${
GCE_GLBC_IMAGE
:-}
"
]]
;
then
sed
-i
"s@image:.*@image:
${
GCE_GLBC_IMAGE
}
@"
"
${
glbc_manifest
}
"
local
-r
src_manifest
=
"
${
KUBE_HOME
}
/kube-manifests/kubernetes/gci-trusty/glbc.manifest"
local
-r
dest_manifest
=
"/etc/kubernetes/manifests/glbc.manifest"
if
[[
-n
"
${
CUSTOM_INGRESS_YAML
:-}
"
]]
;
then
echo
"
${
CUSTOM_INGRESS_YAML
}
"
>
"
${
dest_manifest
}
"
else
cp
"
${
src_manifest
}
"
"
${
dest_manifest
}
"
fi
# Override the glbc image if GCE_GLBC_IMAGE is specified.
if
[[
-n
"
${
GCE_GLBC_IMAGE
:-}
"
]]
;
then
sed
-i
"s|image:.*|image:
${
GCE_GLBC_IMAGE
}
|"
"
${
dest_manifest
}
"
fi
cp
"
${
glbc_manifest
}
"
/etc/kubernetes/manifests/
fi
}
...
...
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