
* Drop v1beta1 from ingress nginx (#7156) * Drop v1beta1 from ingress nginx Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix intorstr logic in controller Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * fixing admission Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * more intorstr fixing * correct template rendering Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix e2e tests for v1 api Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix gofmt errors * This is finally working...almost there... Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Re-add removed validation of AdmissionReview * Prepare for v1.0.0-alpha.1 release Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Update changelog and matrix table for v1.0.0-alpha.1 (#7274) Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * add docs for syslog feature (#7219) * Fix link to e2e-tests.md in developer-guide (#7201) * Use ENV expansion for namespace in args (#7146) Update the DaemonSet namespace references to use the `POD_NAMESPACE` environment variable in the same way that the Deployment does. * chart: using Helm builtin capabilities check (#7190) Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> * Update proper default value for HTTP2MaxConcurrentStreams in Docs (#6944) It should be 128 as documented in https://github.com/kubernetes/ingress-nginx/blob/master/internal/ingress/controller/config/config.go#L780 * Fix MaxWorkerOpenFiles calculation on high cores nodes (#7107) * Fix MaxWorkerOpenFiles calculation on high cores nodes * Add e2e test for rlimit_nofile * Fix doc for max-worker-open-files * ingress/tcp: add additional error logging on failed (#7208) * Add file containing stable release (#7313) * Handle named (non-numeric) ports correctly (#7311) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Updated v1beta1 to v1 as its deprecated (#7308) * remove mercurial from build (#7031) * Retry to download maxmind DB if it fails (#7242) * Retry to download maxmind DB if it fails. Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Add retries count arg, move retry logic into DownloadGeoLite2DB function Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Reorder parameters in DownloadGeoLite2DB Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Remove hardcoded value Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Release v1.0.0-alpha.1 * Add changelog for v1.0.0-alpha.2 * controller: ignore non-service backends (#7332) * controller: ignore non-service backends Signed-off-by: Carlos Panato <ctadeu@gmail.com> * update per feedback Signed-off-by: Carlos Panato <ctadeu@gmail.com> * fix: allow scope/tcp/udp configmap namespace to altered (#7161) * Lower webhook timeout for digital ocean (#7319) * Lower webhook timeout for digital ocean * Set Digital Ocean value controller.admissionWebhooks.timeoutSeconds to 29 * update OWNERS and aliases files (#7365) (#7366) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Downgrade Lua modules for s390x (#7355) Downgrade Lua modules to last known working version. * Fix IngressClass logic for newer releases (#7341) * Fix IngressClass logic for newer releases Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Change e2e tests for the new IngressClass presence * Fix chart and admission tests Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix helm chart test Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix reviews * Remove ingressclass code from admission * update tag to v1.0.0-beta.1 * update readme and changelog for v1.0.0-beta.1 * Release v1.0.0-beta.1 - helm and manifests (#7422) * Change the order of annotation just to trigger a new helm release (#7425) * [cherry-pick] Add dev-v1 branch into helm releaser (#7428) * Add dev-v1 branch into helm releaser (#7424) * chore: add link for artifacthub.io/prerelease annotations Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Ricardo Katz <rikatz@users.noreply.github.com> * k8s job ci pipeline for dev-v1 br v1.22.0 (#7453) * k8s job ci pipeline for dev-v1 br v1.22.0 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * k8s job ci pipeline for dev-v1 br v1.21.2 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * remove v1.21.1 version Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * Add controller.watchIngressWithoutClass config option (#7459) Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com> * Release new helm chart with certgen fixed (#7478) * Update go version, modules and remove ioutil * Release new helm chart with certgen fixed * changed appversion, chartversion, TAG, image (#7490) * Fix CI conflict * Fix CI conflict * Fix build.sh from rebase process * Fix controller_test post rebase Co-authored-by: Tianhao Guo <rggth09@gmail.com> Co-authored-by: Ray <61553+rctay@users.noreply.github.com> Co-authored-by: Bill Cassidy <cassid4@gmail.com> Co-authored-by: Jintao Zhang <tao12345666333@163.com> Co-authored-by: Sathish Ramani <rsathishx87@gmail.com> Co-authored-by: Mansur Marvanov <nanorobocop@gmail.com> Co-authored-by: Matt1360 <568198+Matt1360@users.noreply.github.com> Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com> Co-authored-by: Kundan Kumar <kundan.kumar@india.nec.com> Co-authored-by: Tom Hayward <thayward@infoblox.com> Co-authored-by: Sergey Shakuto <sshakuto@infoblox.com> Co-authored-by: Tore <tore.lonoy@gmail.com> Co-authored-by: Bouke Versteegh <info@boukeversteegh.nl> Co-authored-by: Shahid <shahid@us.ibm.com> Co-authored-by: James Strong <strong.james.e@gmail.com> Co-authored-by: Long Wu Yuan <longwuyuan@gmail.com> Co-authored-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Neha Lohia <nehapithadiya444@gmail.com> Co-authored-by: Akshit Grover <akshit.grover2016@gmail.com>
209 lines
5.6 KiB
Go
209 lines
5.6 KiB
Go
/*
|
|
Copyright 2015 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 store
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"k8s.io/klog/v2"
|
|
|
|
"github.com/pkg/errors"
|
|
apiv1 "k8s.io/api/core/v1"
|
|
networking "k8s.io/api/networking/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"k8s.io/ingress-nginx/internal/file"
|
|
"k8s.io/ingress-nginx/internal/ingress"
|
|
"k8s.io/ingress-nginx/internal/net/ssl"
|
|
)
|
|
|
|
// syncSecret synchronizes the content of a TLS Secret (certificate(s), secret
|
|
// key) with the filesystem. The resulting files can be used by NGINX.
|
|
func (s *k8sStore) syncSecret(key string) {
|
|
s.syncSecretMu.Lock()
|
|
defer s.syncSecretMu.Unlock()
|
|
|
|
klog.V(3).InfoS("Syncing Secret", "name", key)
|
|
|
|
cert, err := s.getPemCertificate(key)
|
|
if err != nil {
|
|
if !isErrSecretForAuth(err) {
|
|
klog.Warningf("Error obtaining X.509 certificate: %v", err)
|
|
}
|
|
return
|
|
}
|
|
|
|
// create certificates and add or update the item in the store
|
|
cur, err := s.GetLocalSSLCert(key)
|
|
if err == nil {
|
|
if cur.Equal(cert) {
|
|
// no need to update
|
|
return
|
|
}
|
|
klog.InfoS("Updating secret in local store", "name", key)
|
|
s.sslStore.Update(key, cert)
|
|
// this update must trigger an update
|
|
// (like an update event from a change in Ingress)
|
|
s.sendDummyEvent()
|
|
return
|
|
}
|
|
|
|
klog.InfoS("Adding secret to local store", "name", key)
|
|
s.sslStore.Add(key, cert)
|
|
// this update must trigger an update
|
|
// (like an update event from a change in Ingress)
|
|
s.sendDummyEvent()
|
|
}
|
|
|
|
// getPemCertificate receives a secret, and creates a ingress.SSLCert as return.
|
|
// It parses the secret and verifies if it's a keypair, or a 'ca.crt' secret only.
|
|
func (s *k8sStore) getPemCertificate(secretName string) (*ingress.SSLCert, error) {
|
|
secret, err := s.listers.Secret.ByKey(secretName)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
cert, okcert := secret.Data[apiv1.TLSCertKey]
|
|
key, okkey := secret.Data[apiv1.TLSPrivateKeyKey]
|
|
ca := secret.Data["ca.crt"]
|
|
|
|
crl := secret.Data["ca.crl"]
|
|
|
|
auth := secret.Data["auth"]
|
|
|
|
// namespace/secretName -> namespace-secretName
|
|
nsSecName := strings.Replace(secretName, "/", "-", -1)
|
|
|
|
var sslCert *ingress.SSLCert
|
|
if okcert && okkey {
|
|
if cert == nil {
|
|
return nil, fmt.Errorf("key 'tls.crt' missing from Secret %q", secretName)
|
|
}
|
|
|
|
if key == nil {
|
|
return nil, fmt.Errorf("key 'tls.key' missing from Secret %q", secretName)
|
|
}
|
|
|
|
sslCert, err = ssl.CreateSSLCert(cert, key, string(secret.UID))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unexpected error creating SSL Cert: %v", err)
|
|
}
|
|
|
|
if len(ca) > 0 {
|
|
caCert, err := ssl.CheckCACert(ca)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("parsing CA certificate: %v", err)
|
|
}
|
|
|
|
path, err := ssl.StoreSSLCertOnDisk(nsSecName, sslCert)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error while storing certificate and key: %v", err)
|
|
}
|
|
|
|
sslCert.PemFileName = path
|
|
sslCert.CACertificate = caCert
|
|
sslCert.CAFileName = path
|
|
sslCert.CASHA = file.SHA1(path)
|
|
|
|
err = ssl.ConfigureCACertWithCertAndKey(nsSecName, ca, sslCert)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error configuring CA certificate: %v", err)
|
|
}
|
|
|
|
if len(crl) > 0 {
|
|
err = ssl.ConfigureCRL(nsSecName, crl, sslCert)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error configuring CRL certificate: %v", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
msg := fmt.Sprintf("Configuring Secret %q for TLS encryption (CN: %v)", secretName, sslCert.CN)
|
|
if ca != nil {
|
|
msg += " and authentication"
|
|
}
|
|
|
|
if crl != nil {
|
|
msg += " and CRL"
|
|
}
|
|
|
|
klog.V(3).InfoS(msg)
|
|
} else if len(ca) > 0 {
|
|
sslCert, err = ssl.CreateCACert(ca)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unexpected error creating SSL Cert: %v", err)
|
|
}
|
|
|
|
err = ssl.ConfigureCACert(nsSecName, ca, sslCert)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error configuring CA certificate: %v", err)
|
|
}
|
|
|
|
if len(crl) > 0 {
|
|
err = ssl.ConfigureCRL(nsSecName, crl, sslCert)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
// makes this secret in 'syncSecret' to be used for Certificate Authentication
|
|
// this does not enable Certificate Authentication
|
|
klog.V(3).InfoS("Configuring Secret for TLS authentication", "secret", secretName)
|
|
} else {
|
|
if auth != nil {
|
|
return nil, ErrSecretForAuth
|
|
}
|
|
|
|
return nil, fmt.Errorf("secret %q contains no keypair or CA certificate", secretName)
|
|
}
|
|
|
|
sslCert.Name = secret.Name
|
|
sslCert.Namespace = secret.Namespace
|
|
|
|
// the default SSL certificate needs to be present on disk
|
|
if secretName == s.defaultSSLCertificate {
|
|
path, err := ssl.StoreSSLCertOnDisk(nsSecName, sslCert)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "storing default SSL Certificate")
|
|
}
|
|
|
|
sslCert.PemFileName = path
|
|
}
|
|
|
|
return sslCert, nil
|
|
}
|
|
|
|
// sendDummyEvent sends a dummy event to trigger an update
|
|
// This is used in when a secret change
|
|
func (s *k8sStore) sendDummyEvent() {
|
|
s.updateCh.In() <- Event{
|
|
Type: UpdateEvent,
|
|
Obj: &networking.Ingress{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "dummy",
|
|
Namespace: "dummy",
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
// ErrSecretForAuth error to indicate a secret is used for authentication
|
|
var ErrSecretForAuth = fmt.Errorf("secret is used for authentication")
|
|
|
|
func isErrSecretForAuth(e error) bool {
|
|
return e == ErrSecretForAuth
|
|
}
|