Skip to content

Commit

Permalink
Merge pull request #312 from nicksardo/echo-image
Browse files Browse the repository at this point in the history
Simple web server for testing ingress-gce features
  • Loading branch information
nicksardo authored Jun 6, 2018
2 parents c36b7f6 + e862da4 commit cc79eaf
Show file tree
Hide file tree
Showing 9 changed files with 400 additions and 1 deletion.
18 changes: 18 additions & 0 deletions Dockerfile.echo
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Copyright 2018 The Kubernetes Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

FROM debian:9

ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN
ENTRYPOINT ["/ARG_BIN"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PKG := k8s.io/ingress-gce

# List of binaries to build. You must have a matching Dockerfile.BINARY
# for each BINARY.
CONTAINER_BINARIES := glbc e2e-test
CONTAINER_BINARIES := glbc e2e-test echo

# Latest commit hash for current branch.
GIT_COMMIT := $(shell git rev-parse HEAD)
Expand Down
35 changes: 35 additions & 0 deletions cmd/echo/app/env.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package app

import "os"

type Env struct {
Node string
Pod string
Namespace string
}

var (
E = Env{}
)

func init() {
E.Node = os.Getenv("node")
E.Pod = os.Getenv("pod")
E.Namespace = os.Getenv("namespace")
}
41 changes: 41 additions & 0 deletions cmd/echo/app/flags.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package app

import (
"flag"
"time"
)

const (
DefaultCertLifeSpan = 24 * time.Hour * 365
)

var (
F = struct {
CertificateLifeSpan time.Duration
HTTPPort int
HTTPSPort int
}{}
)

// RegisterFlags creates flags.
func RegisterFlags() {
flag.DurationVar(&F.CertificateLifeSpan, "cert-duration", DefaultCertLifeSpan, "The lifespan of the TLS certificate created on binary start")
flag.IntVar(&F.HTTPPort, "http-port", 8080, "Port use for HTTP, 0 will disable this protocol")
flag.IntVar(&F.HTTPSPort, "https-port", 8443, "Port use for HTTPS, 0 will disable this protocol")
}
108 changes: 108 additions & 0 deletions cmd/echo/app/handlers.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package app

import (
"context"
"encoding/json"
"fmt"
"net/http"
"time"

"github.com/golang/glog"
)

const (
serverIdleTimeout = 620 * time.Second
)

// RunHTTPServer runs HTTP and HTTPS goroutines and blocks.
func RunHTTPServer(ctx context.Context) {
http.HandleFunc("/healthcheck", healthCheck)
http.HandleFunc("/", echo)

go func() {
if F.HTTPSPort == 0 {
return
}

server := &http.Server{Addr: fmt.Sprintf(":%d", F.HTTPSPort), IdleTimeout: serverIdleTimeout}
cert, key := createCert()
err := server.ListenAndServeTLS(cert, key)
if err != nil {
glog.Fatal(err)
}

<-ctx.Done()
server.Shutdown(ctx)
}()

go func() {
if F.HTTPPort == 0 {
return
}

server := &http.Server{Addr: fmt.Sprintf(":%d", F.HTTPPort), IdleTimeout: serverIdleTimeout}
err := server.ListenAndServe()
if err != nil {
glog.Fatal(err)
}

<-ctx.Done()
server.Shutdown(ctx)
}()

<-ctx.Done()
}

func healthCheck(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
w.Write([]byte("health: OK"))
glog.V(3).Infof("healthcheck: %v, %v, %v", time.Now(), r.UserAgent(), r.RemoteAddr)
}

func echo(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)

var dump = struct {
Method string `json:"method"`
URI string `json:"uri"`
HTTPVersion string `json:"httpVersion"`
K8sEnv Env `json:"k8sEnv"`
RemoteAddr string `json:"remoteAddr"`
TLS bool `json:"tls"`
Header map[string][]string `json:"header"`
}{
Method: r.Method,
URI: r.RequestURI,
HTTPVersion: fmt.Sprintf("%d.%d", r.ProtoMajor, r.ProtoMinor),
K8sEnv: E,
RemoteAddr: r.RemoteAddr,
Header: r.Header,
TLS: r.TLS != nil,
}

dumpData, err := json.MarshalIndent(dump, "", "\t")
if err != nil {
glog.Errorf("failed to marshal dump: %v", err)
return
}

w.Write(dumpData)
glog.V(3).Infof("echo: %v, %v, %v", time.Now(), r.UserAgent(), r.RemoteAddr)
}
103 changes: 103 additions & 0 deletions cmd/echo/app/tls.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package app

import (
"bytes"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
"crypto/x509/pkix"
"encoding/pem"
"io/ioutil"
"math/big"
"time"

"github.com/golang/glog"
)

// createCert creates a certificate and key in temporary files and returns their paths.
func createCert() (certFilePath string, keyFilepath string) {
cert, key, err := generateInsecureCertAndKey("echo", time.Now(), F.CertificateLifeSpan)
if err != nil {
glog.Fatal(err)
}

tmpCert, err := ioutil.TempFile("", "server.crt")
if err != nil {
glog.Fatal(err)
}

tmpKey, err := ioutil.TempFile("", "server.key")
if err != nil {
glog.Fatal(err)
}

if err := ioutil.WriteFile(tmpCert.Name(), cert, 0644); err != nil {
glog.Fatal(err)
}

if err := ioutil.WriteFile(tmpKey.Name(), key, 0644); err != nil {
glog.Fatal(err)
}

return tmpCert.Name(), tmpKey.Name()
}

const rsaBits = 2048

// https://golang.org/src/crypto/tls/generate_cert.go
func generateInsecureCertAndKey(organization string, validFrom time.Time, validFor time.Duration) (cert, key []byte, err error) {
serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
if err != nil {
glog.Fatalf("failed to generate serial number: %s", err)
}

validUntill := validFrom.Add(validFor)

priv, err := rsa.GenerateKey(rand.Reader, rsaBits)
if err != nil {
glog.Fatalf("failed to generate private key: %s", err)
}

template := x509.Certificate{
SerialNumber: serialNumber,
Subject: pkix.Name{
Organization: []string{organization},
},
NotBefore: validFrom,
NotAfter: validUntill,

KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
BasicConstraintsValid: true,
}

derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
if err != nil {
glog.Fatalf("Failed to create certificate: %s", err)
}
var certBytes bytes.Buffer
pem.Encode(&certBytes, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})

var keyBytes bytes.Buffer
pb := &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}
pem.Encode(&keyBytes, pb)

return certBytes.Bytes(), keyBytes.Bytes(), nil
}
31 changes: 31 additions & 0 deletions cmd/echo/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package main

import (
"context"
"flag"

"k8s.io/ingress-gce/cmd/echo/app"
)

func main() {
app.RegisterFlags()
flag.Parse()

app.RunHTTPServer(context.Background())
}
42 changes: 42 additions & 0 deletions deploy/echo/yaml/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: echo
spec:
replicas: 1
template:
metadata:
labels:
app: echo
spec:
containers:
- name: echo
image: [YOUR REGISTRY]/echoserver:latest
env:
- name: namespace
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: pod
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: node
valueFrom:
fieldRef:
fieldPath: spec.nodeName
ports:
- name: http
containerPort: 8080
- name: https
containerPort: 8443
readinessProbe:
httpGet:
path: /healthcheck
scheme: HTTP
port: http
livenessProbe:
httpGet:
path: /healthcheck
scheme: HTTP
port: http
Loading

0 comments on commit cc79eaf

Please sign in to comment.