Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
k8s-ingress
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
uplex-varnish
k8s-ingress
Commits
f8220d1c
Commit
f8220d1c
authored
Jul 09, 2020
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Internal renaming to reflect changing "readiness" to "configured".
VCL label and source file names changed.
parent
159f919a
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
7 deletions
+7
-7
Dockerfile.klarlack
container/Dockerfile.klarlack
+1
-1
Dockerfile.varnish
container/Dockerfile.varnish
+1
-1
boot.vcl
container/boot.vcl
+1
-1
ok.vcl
container/ok.vcl
+0
-0
start.cli
container/start.cli
+2
-2
varnish.go
pkg/varnish/varnish.go
+2
-2
No files found.
container/Dockerfile.klarlack
View file @
f8220d1c
...
...
@@ -38,7 +38,7 @@ RUN /bin/mkdir /run/varnish && \
/usr/sbin/groupmod -g 998 varnish
COPY bogo_backend.vcl /etc/varnish/
COPY
ready
.vcl /etc/varnish/
COPY
ok
.vcl /etc/varnish/
COPY notavailable.vcl /etc/varnish
COPY boot.vcl /etc/varnish
COPY start.cli /etc/varnish
...
...
container/Dockerfile.varnish
View file @
f8220d1c
...
...
@@ -17,7 +17,7 @@ RUN yum install -y -q epel-release && yum -q makecache -y fast && \
RUN /bin/mkdir /var/run/varnish
COPY bogo_backend.vcl /etc/varnish/
COPY
ready
.vcl /etc/varnish/
COPY
ok
.vcl /etc/varnish/
COPY notavailable.vcl /etc/varnish
COPY boot.vcl /etc/varnish
COPY start.cli /etc/varnish
...
...
container/boot.vcl
View file @
f8220d1c
...
...
@@ -10,7 +10,7 @@ sub vcl_recv {
return (synth(65404));
}
if (local.socket == "vk8s_cfg") {
return (vcl(vk8s_
readiness
));
return (vcl(vk8s_
configured
));
}
return (vcl(vk8s_regular));
}
...
...
container/
ready
.vcl
→
container/
ok
.vcl
View file @
f8220d1c
File moved
container/start.cli
View file @
f8220d1c
vcl.load vk8s_
ready /etc/varnish/ready
.vcl
vcl.load vk8s_
ok /etc/varnish/ok
.vcl
vcl.load vk8s_notavailable /etc/varnish/notavailable.vcl
vcl.label vk8s_
readiness
vk8s_notavailable
vcl.label vk8s_
configured
vk8s_notavailable
vcl.label vk8s_regular vk8s_notavailable
vcl.load boot /etc/varnish/boot.vcl
vcl.use boot
...
...
pkg/varnish/varnish.go
View file @
f8220d1c
...
...
@@ -55,8 +55,8 @@ import (
const
(
regularLabel
=
"vk8s_regular"
readinessLabel
=
"vk8s_
readiness
"
readyCfg
=
"vk8s_
ready
"
readinessLabel
=
"vk8s_
configured
"
readyCfg
=
"vk8s_
ok
"
notAvailCfg
=
"vk8s_notavailable"
ingressPrefix
=
"vk8s_ing_"
)
...
...
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