Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: support custom gateway cert expiry days. #2047

Merged
merged 5 commits into from
Oct 23, 2023
Merged

refactor: support custom gateway cert expiry days. #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e084e2
refactor: support custom gateway cert expiry days.
qicz Oct 23, 2023
ffc8131
Merge branch 'main' of github.com:envoyproxy/gateway into support-cus…
qicz Oct 23, 2023
5aaa9ba
fix env
qicz Oct 23, 2023
59a8b59
update docs
qicz Oct 23, 2023
d2baef3
Merge branch 'main' of github.com:envoyproxy/gateway into support-cus…
qicz Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions charts/gateway-helm/templates/certgen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ spec:
fieldPath: metadata.namespace
- name: KUBERNETES_CLUSTER_DOMAIN
value: {{ .Values.kubernetesClusterDomain }}
- name: ENVOY_GATEWAY_CERTIFICATE_EXPIRY_DAYS
value: "{{ .Values.deployment.envoyGateway.cert.expiryDays }}"
image: {{ .Values.deployment.envoyGateway.image.repository }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
imagePullPolicy: {{ .Values.deployment.envoyGateway.imagePullPolicy }}
name: envoy-gateway-certgen
Expand Down
2 changes: 2 additions & 0 deletions charts/gateway-helm/values.tmpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
deployment:
envoyGateway:
cert:
expiryDays: 365
image:
repository: ${ImageRepository}
tag: '${ImageTag}'
Expand Down
5 changes: 1 addition & 4 deletions internal/crypto/certgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ const (
// DefaultEnvoyDNSPrefix defines the default Envoy DNS prefix.
DefaultEnvoyDNSPrefix = "*"

// DefaultCertificateLifetime holds the default certificate lifetime (in days).
DefaultCertificateLifetime = 365

// keySize sets the RSA key size to 2048 bits. This is minimum recommended size
// for RSA keys.
keySize = 2048
Expand Down Expand Up @@ -97,7 +94,7 @@ func GenerateCerts(cfg *config.Server) (*Certificates, error) {
switch certCfg.Provider.Type {
case ProviderTypeEnvoyGateway:
now := time.Now()
expiry := now.Add(24 * time.Duration(DefaultCertificateLifetime) * time.Hour)
expiry := now.Add(24 * time.Duration(cfg.CertificateExpiryDays) * time.Hour)
caCertPEM, caKeyPEM, err := newCA(DefaultEnvoyGatewayDNSPrefix, expiry)
if err != nil {
return nil, err
Expand Down
7 changes: 6 additions & 1 deletion internal/envoygateway/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ const (
EnvoyGatewayServiceName = "envoy-gateway"
// EnvoyPrefix is the prefix applied to the Envoy ConfigMap, Service, Deployment, and ServiceAccount.
EnvoyPrefix = "envoy"
// DefaultCertificateExpiryDays holds the default certificate lifetime (in days).
DefaultCertificateExpiryDays = 365
)

// Server wraps the EnvoyGateway configuration and additional parameters
Expand All @@ -36,6 +38,8 @@ type Server struct {
DNSDomain string
// Logger is the logr implementation used by Envoy Gateway.
Logger logging.Logger
// CertificateExpiryDays holds the certificate lifetime (in days).
CertificateExpiryDays int
}

// New returns a Server with default parameters.
Expand All @@ -45,7 +49,8 @@ func New() (*Server, error) {
Namespace: env.Lookup("ENVOY_GATEWAY_NAMESPACE", DefaultNamespace),
DNSDomain: env.Lookup("KUBERNETES_CLUSTER_DOMAIN", DefaultDNSDomain),
// the default logger
Logger: logging.DefaultLogger(v1alpha1.LogLevelInfo),
Logger: logging.DefaultLogger(v1alpha1.LogLevelInfo),
CertificateExpiryDays: env.Lookup("ENVOY_GATEWAY_CERTIFICATE_EXPIRY_DAYS", DefaultCertificateExpiryDays),
}, nil
}

Expand Down
1 change: 1 addition & 0 deletions site/content/en/latest/install/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ The Helm chart for Envoy Gateway
| config.envoyGateway.logging.level.default | string | `"info"` | |
| config.envoyGateway.provider.type | string | `"Kubernetes"` | |
| createNamespace | bool | `false` | |
| deployment.envoyGateway.cert.expiryDays | int | `365` | |
| deployment.envoyGateway.image.repository | string | `"${ImageRepository}"` | |
| deployment.envoyGateway.image.tag | string | `"${ImageTag}"` | |
| deployment.envoyGateway.imagePullPolicy | string | `"Always"` | |
Expand Down