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
4ed0c71b
Commit
4ed0c71b
authored
Nov 12, 2018
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
go fmt fixes
parent
642efd56
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
12 deletions
+13
-12
controller.go
controller/controller.go
+6
-5
utils.go
controller/utils.go
+2
-2
main.go
main.go
+1
-1
varnish.go
varnish/varnish.go
+3
-3
vcl.go
varnish/vcl/vcl.go
+1
-1
No files found.
controller/controller.go
View file @
4ed0c71b
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* SUCH DAMAGE.
*/
*/
package
controller
package
controller
...
@@ -56,6 +56,7 @@ const (
...
@@ -56,6 +56,7 @@ const (
ingressClassKey
=
"kubernetes.io/ingress.class"
ingressClassKey
=
"kubernetes.io/ingress.class"
resyncPeriod
=
0
resyncPeriod
=
0
watchNamespace
=
api_v1
.
NamespaceAll
watchNamespace
=
api_v1
.
NamespaceAll
// resyncPeriod = 30 * time.Second
// resyncPeriod = 30 * time.Second
)
)
...
@@ -436,7 +437,7 @@ func (ingc *IngressController) ing2VCLSpec(ing *extensions.Ingress) (vcl.Spec, e
...
@@ -436,7 +437,7 @@ func (ingc *IngressController) ing2VCLSpec(ing *extensions.Ingress) (vcl.Spec, e
}
}
for
_
,
rule
:=
range
ing
.
Spec
.
Rules
{
for
_
,
rule
:=
range
ing
.
Spec
.
Rules
{
if
rule
.
Host
==
""
{
if
rule
.
Host
==
""
{
return
vclSpec
,
fmt
.
Errorf
(
"Ingress rule contains "
+
return
vclSpec
,
fmt
.
Errorf
(
"Ingress rule contains "
+
"empty Host"
)
"empty Host"
)
}
}
vclRule
:=
vcl
.
Rule
{
Host
:
rule
.
Host
}
vclRule
:=
vcl
.
Rule
{
Host
:
rule
.
Host
}
...
@@ -447,7 +448,7 @@ func (ingc *IngressController) ing2VCLSpec(ing *extensions.Ingress) (vcl.Spec, e
...
@@ -447,7 +448,7 @@ func (ingc *IngressController) ing2VCLSpec(ing *extensions.Ingress) (vcl.Spec, e
}
}
for
_
,
path
:=
range
rule
.
IngressRuleValue
.
HTTP
.
Paths
{
for
_
,
path
:=
range
rule
.
IngressRuleValue
.
HTTP
.
Paths
{
addrs
,
err
:=
ingc
.
ingBackend2Addrs
(
path
.
Backend
,
addrs
,
err
:=
ingc
.
ingBackend2Addrs
(
path
.
Backend
,
ing
.
Namespace
)
;
ing
.
Namespace
)
if
err
!=
nil
{
if
err
!=
nil
{
return
vclSpec
,
err
return
vclSpec
,
err
}
}
...
@@ -486,10 +487,10 @@ func (ingc *IngressController) ingBackend2Addrs(backend extensions.IngressBacken
...
@@ -486,10 +487,10 @@ func (ingc *IngressController) ingBackend2Addrs(backend extensions.IngressBacken
targetPort
:=
int32
(
0
)
targetPort
:=
int32
(
0
)
ingSvcPort
:=
backend
.
ServicePort
ingSvcPort
:=
backend
.
ServicePort
for
_
,
port
:=
range
svc
.
Spec
.
Ports
{
for
_
,
port
:=
range
svc
.
Spec
.
Ports
{
if
(
(
ingSvcPort
.
Type
==
intstr
.
Int
&&
if
(
ingSvcPort
.
Type
==
intstr
.
Int
&&
port
.
Port
==
int32
(
ingSvcPort
.
IntValue
()))
||
port
.
Port
==
int32
(
ingSvcPort
.
IntValue
()))
||
(
ingSvcPort
.
Type
==
intstr
.
String
&&
(
ingSvcPort
.
Type
==
intstr
.
String
&&
port
.
Name
==
ingSvcPort
.
String
()
))
{
port
.
Name
==
ingSvcPort
.
String
(
))
{
targetPort
,
err
=
ingc
.
getTargetPort
(
&
port
,
svc
)
targetPort
,
err
=
ingc
.
getTargetPort
(
&
port
,
svc
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
controller/utils.go
View file @
4ed0c71b
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* SUCH DAMAGE.
*/
*/
package
controller
package
controller
...
@@ -143,7 +143,7 @@ func NewTask(key string, obj interface{}) (Task, error) {
...
@@ -143,7 +143,7 @@ func NewTask(key string, obj interface{}) (Task, error) {
var
k
Kind
var
k
Kind
switch
t
:=
obj
.
(
type
)
{
switch
t
:=
obj
.
(
type
)
{
case
*
extensions
.
Ingress
:
case
*
extensions
.
Ingress
:
// ing := obj.(*extensions.Ingress)
// ing := obj.(*extensions.Ingress)
k
=
Ingress
k
=
Ingress
case
*
api_v1
.
Endpoints
:
case
*
api_v1
.
Endpoints
:
k
=
Endpoints
k
=
Endpoints
...
...
main.go
View file @
4ed0c71b
...
@@ -10,8 +10,8 @@ import (
...
@@ -10,8 +10,8 @@ import (
"os/signal"
"os/signal"
"syscall"
"syscall"
"code.uplex.de/uplex-varnish/k8s-ingress/varnish"
"code.uplex.de/uplex-varnish/k8s-ingress/controller"
"code.uplex.de/uplex-varnish/k8s-ingress/controller"
"code.uplex.de/uplex-varnish/k8s-ingress/varnish"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/rest"
...
...
varnish/varnish.go
View file @
4ed0c71b
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* SUCH DAMAGE.
*/
*/
/*
/*
// TODO
// TODO
...
@@ -142,7 +142,7 @@ func (vc *VarnishController) Start(errChan chan error) {
...
@@ -142,7 +142,7 @@ func (vc *VarnishController) Start(errChan chan error) {
// XXX config the timeout
// XXX config the timeout
vsm
:=
vsm
.
New
()
vsm
:=
vsm
.
New
()
if
vsm
==
nil
{
if
vsm
==
nil
{
vc
.
errChan
<-
errors
.
New
(
"Cannot initiate attachment to "
+
vc
.
errChan
<-
errors
.
New
(
"Cannot initiate attachment to "
+
"Varnish shared memory"
)
"Varnish shared memory"
)
return
return
}
}
...
...
varnish/vcl/vcl.go
View file @
4ed0c71b
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* SUCH DAMAGE.
*/
*/
package
vcl
package
vcl
...
...
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