elias/caddy-ingess
1
0
Fork 0
mirror of https://github.com/eliasstepanik/caddy-ingess.git synced 2026-01-10 03:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

update dependencies (#20)

Browse Source 
* update dependencies

* Update codebase to match with caddy changes in beta11
This commit is contained in:
Marco Vito Moscaritolo 2019-12-29 22:55:01 +01:00 committed by Matt Holt
parent 7ead55505b
commit 2e31a66bbd
6 changed files with 572 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
go.mod
View File

@ -1,22 +1,41 @@
module github.com/caddyserver/ingress
go 1.12
go 1.13
require (
github.com/caddyserver/caddy/v2 v2.0.0-beta6
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/mholt/certmagic v0.7.5
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/caddyserver/caddy/v2 v2.0.0-beta11
github.com/mholt/certmagic v0.9.0
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v1.1.0
github.com/sirupsen/logrus v1.4.2
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/go-playground/pool.v3 v3.1.1
k8s.io/api v0.0.0-20190602125759-c1e9adbde704
k8s.io/apiextensions-apiserver v0.0.0-20190602131520-451a9c13a3c8 // indirect
k8s.io/apimachinery v0.0.0-20190602125621-c0632ccbde11
k8s.io/client-go v0.0.0-20190602130007-e65ca70987a6
k8s.io/cloud-provider v0.0.0-20190503112208-4f570a5e5694 // indirect
k8s.io/kubernetes v1.14.1
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 // indirect
k8s.io/api v0.17.0
k8s.io/apimachinery v0.17.0
k8s.io/client-go v0.17.0
k8s.io/kubernetes v1.17.0
)
replace (
k8s.io/api => k8s.io/api v0.17.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.0
k8s.io/apimachinery => k8s.io/apimachinery v0.17.0
k8s.io/apiserver => k8s.io/apiserver v0.17.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.0
k8s.io/client-go => k8s.io/client-go v0.17.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.0
k8s.io/code-generator => k8s.io/code-generator v0.17.0
k8s.io/component-base => k8s.io/component-base v0.17.0
k8s.io/cri-api => k8s.io/cri-api v0.17.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.0
k8s.io/kubectl => k8s.io/kubectl v0.17.0
k8s.io/kubelet => k8s.io/kubelet v0.17.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.0
k8s.io/metrics => k8s.io/metrics v0.17.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.0
)

659
go.sum
View File

File diff suppressed because it is too large Load Diff

3
internal/caddy/config.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddytls"
)
@ -54,7 +55,7 @@ func NewConfig(namespace string, cfg ControllerConfig) *Config {
},
},
},
Certificates: make(map[string]json.RawMessage, 0),
CertificatesRaw: caddy.ModuleMap{},
},
"http": caddyhttp.App{
Servers: map[string]*caddyhttp.Server{

4
internal/controller/action.go
View File

@ -160,10 +160,10 @@ func updateConfig(c *CaddyController) error {
// after TLS secrets are synched we should load them in the cert pool.
if tlsCfg != nil {
apps["tls"].(caddytls.TLS).Certificates["load_folders"] = tlsCfg["load_folders"].(json.RawMessage)
apps["tls"].(caddytls.TLS).CertificatesRaw["load_folders"] = tlsCfg["load_folders"].(json.RawMessage)
} else {
// reset cert loading
apps["tls"].(caddytls.TLS).Certificates["load_folders"] = json.RawMessage(`[]`)
apps["tls"].(caddytls.TLS).CertificatesRaw["load_folders"] = json.RawMessage(`[]`)
}
// skip auto https for hosts with certs provided

14
internal/controller/controller.go
View File

@ -197,7 +197,10 @@ func (c *CaddyController) handleErr(err error, action interface{}) {
// loadConfigFromFile loads caddy with a config defined by an io.Reader.
func (c *CaddyController) loadConfigFromFile(cfg io.Reader) error {
err := caddy.Load(cfg)
buf := new(bytes.Buffer)
buf.ReadFrom(cfg)
err := caddy.Load(buf.Bytes(), true)
if err != nil {
return fmt.Errorf("could not load caddy config %v", err.Error())
}
@ -212,14 +215,7 @@ func (c *CaddyController) reloadCaddy() error {
return err
}
// DEBUG ONLY
// PRETTY PRINT CADDY CONFIG ON UPDATE
js, _ := json.MarshalIndent(c.resourceStore.CaddyConfig, "", "\t")
fmt.Println(string(js))
//
r := bytes.NewReader(j)
err = caddy.Load(r)
err = caddy.Load(j, true)
if err != nil {
return fmt.Errorf("could not reload caddy config %v", err.Error())
}

4
pkg/storage/storage.go
View File

@ -37,8 +37,8 @@ type SecretStorage struct {
func (SecretStorage) CaddyModule() caddy.ModuleInfo {
return caddy.ModuleInfo{
Name: "caddy.storage.secret_store",
New: func() caddy.Module { return new(SecretStorage) },
ID: "caddy.storage.secret_store",
New: func() caddy.Module { return new(SecretStorage) },
}
}