Skip to content

Commit

Permalink
Merge pull request #922 from RedHatInsights/psav/remove_all_envoy_ref…
Browse files Browse the repository at this point in the history 
…erences

Remove all Envoy references
  • Loading branch information
@psav
psav authored Jan 17, 2024
2 parents ef4b69e + bebcca7 commit 2650c12
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 24 deletions.
2 changes: 0 additions & 2 deletions controllers/cloud.redhat.com/providers/web/impl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import (
// CoreService is the service for the apps deployments.
var CoreService = rc.NewMultiResourceIdent(ProvName, "core_service", &core.Service{})

var CoreEnvoyConfigMap = rc.NewMultiResourceIdent(ProvName, "core_envoy_config_map", &core.ConfigMap{}, rc.ResourceOptions{WriteNow: true})

var CoreCaddyConfigMap = rc.NewMultiResourceIdent(ProvName, "core_caddy_config_map", &core.ConfigMap{}, rc.ResourceOptions{WriteNow: true})

func makeService(cache *rc.ObjectCache, deployment *crd.Deployment, app *crd.ClowdApp, env *crd.ClowdEnvironment) error {
Expand Down
2 changes: 1 addition & 1 deletion controllers/cloud.redhat.com/providers/web/local.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func NewLocalWebProvider(p *providers.Provider) (providers.ClowderProvider, erro
WebGatewayConfigMap,
WebGatewayCertificate,
WebGatewayCertificateIssuer,
CoreEnvoyConfigMap,
CoreCaddyConfigMap,
CoreService,
)
return &localWebProvider{Provider: *p}, nil
Expand Down
4 changes: 2 additions & 2 deletions controllers/cloud.redhat.com/providers/web/resources_caddygateway.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func makeWebGatewayConfigMap(p *providers.Provider) (string, error) {
cm := &core.ConfigMap{}
snn := providers.GetNamespacedName(p.Env, "caddy-gateway")

if err := p.Cache.Create(CoreEnvoyConfigMap, snn, cm); err != nil {
if err := p.Cache.Create(CoreCaddyConfigMap, snn, cm); err != nil {
return "", err
}

Expand Down Expand Up @@ -314,7 +314,7 @@ func makeWebGatewayConfigMap(p *providers.Provider) (string, error) {
h.Write([]byte(cmData))
hash := fmt.Sprintf("%x", h.Sum(nil))

return hash, p.Cache.Update(CoreEnvoyConfigMap, cm)
return hash, p.Cache.Update(CoreCaddyConfigMap, cm)
}

func makeWebGatewayDeployment(o obj.ClowdObject, objMap providers.ObjectMap, _ bool, _ bool) {
Expand Down
6 changes: 3 additions & 3 deletions docs/antora/modules/providers/pages/web.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ spec:

==== TLS Auth
The *Web Provider* also features a TLS sidecar option which will dynamically create and append an
Envoy sidecar to the deployment pod. This requires enabling in the configuration with an example
Caddy sidecar to the deployment pod. This requires enabling in the configuration with an example
below.

[source,yaml]
Expand All @@ -214,8 +214,8 @@ This configuration will do several things:
cert `Secret`
* Add new ports to the `Service` resource based on if the app has **public** or **private** ports
enabled
* Creates a `ConfigMap` for the *Envoy* sidecar
* Adds the *Envoy* sidecar to the app's pod
* Creates a `ConfigMap` for the *Caddy* sidecar
* Adds the *Caddy* sidecar to the app's pod
** Sets VolumeMounts/Volumes for the config
** Sets VolumeMounts/Volumes for the cert/key
* Adds VolumeMounts/Volumes to the app's deployment to mount the CA chain, which is available in
Expand Down
6 changes: 3 additions & 3 deletions docsmd/providers/web.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ spec:
#### TLS Auth
The **Web Provider** also features a TLS sidecar option which will dynamically create and append an
Envoy sidecar to the deployment pod. This requires enabling in the configuration with an example
Caddy sidecar to the deployment pod. This requires enabling in the configuration with an example
below.
```yaml
Expand All @@ -207,8 +207,8 @@ This configuration will do several things:
cert `Secret`
* Add new ports to the `Service` resource based on if the app has **public** or **private** ports
enabled
* Creates a `ConfigMap` for the *Envoy* sidecar
* Adds the *Envoy* sidecar to the app's pod
* Creates a `ConfigMap` for the *Caddy* sidecar
* Adds the *Caddy* sidecar to the app's pod
** Sets VolumeMounts/Volumes for the config
** Sets VolumeMounts/Volumes for the cert/key
* Adds VolumeMounts/Volumes to the app's deployment to mount the CA chain, which is available in
Expand Down
6 changes: 1 addition & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/RedHatInsights/strimzi-client-go v0.34.2
github.com/caddyserver/caddy/v2 v2.6.4
github.com/cert-manager/cert-manager v1.11.4
github.com/envoyproxy/go-control-plane v0.11.1
github.com/go-logr/logr v1.2.4
github.com/go-logr/zapr v1.2.4
github.com/kedacore/keda/v2 v2.8.1
Expand All @@ -22,7 +21,6 @@ require (
github.com/prometheus/client_golang v1.15.1
github.com/stretchr/testify v1.8.3
go.uber.org/zap v1.24.0
google.golang.org/protobuf v1.31.0
k8s.io/api v0.26.4
k8s.io/apiextensions-apiserver v0.26.4
k8s.io/apimachinery v0.26.4
Expand All @@ -46,11 +44,9 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/caddyserver/certmagic v0.17.2 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgraph-io/badger v1.6.2 // indirect
Expand All @@ -59,7 +55,6 @@ require (
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-kit/kit v0.10.0 // indirect
Expand Down Expand Up @@ -168,6 +163,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
Expand Down
8 changes: 0 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ github.com/caddyserver/certmagic v0.17.2/go.mod h1:ouWUuC490GOLJzkyN35eXfV8bSbwM
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
github.com/cert-manager/cert-manager v1.11.4 h1:vifBFrR+pGE94o/jViITNxCZ2l/TGAqPbeQbdPDU9wI=
github.com/cert-manager/cert-manager v1.11.4/go.mod h1:ataBWLyUn2vVqGLud6JThOAVIbNKz72cZgnt7cBlajk=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
Expand All @@ -102,8 +100,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
Expand Down Expand Up @@ -153,11 +149,7 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM=
github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
Expand Down

0 comments on commit 2650c12

Please sign in to comment.