karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3156 from lonelyCZ/pr-cert-validity-period 

Make the validity period of cert configurable
This commit is contained in:
karmada-bot 2023-02-20 12:46:06 +08:00 committed by GitHub
parent b1f8b09d07 680b05264a
commit dd16753c20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/karmadactl/cmdinit/cmdinit.go
View File

@ -8,6 +8,7 @@ import (
"k8s.io/klog/v2"
"k8s.io/kubectl/pkg/util/templates"
"github.com/karmada-io/karmada/pkg/karmadactl/cmdinit/cert"
"github.com/karmada-io/karmada/pkg/karmadactl/cmdinit/kubernetes"
"github.com/karmada-io/karmada/pkg/karmadactl/util"
"github.com/karmada-io/karmada/pkg/version"
@ -102,6 +103,7 @@ func NewCmdInit(parentCommand string) *cobra.Command {
// cert
flags.StringVar(&opts.ExternalIP, "cert-external-ip", "", "the external IP of Karmada certificate (e.g 192.168.1.2,172.16.1.2)")
flags.StringVar(&opts.ExternalDNS, "cert-external-dns", "", "the external DNS of Karmada certificate (e.g localhost,localhost.com)")
flags.DurationVar(&opts.CertValidity, "cert-validity-period", cert.Duration365d, "the validity period of Karmada certificate (e.g 8760h0m0s, that is 365 days)")
// Kubernetes
flags.StringVarP(&opts.Namespace, "namespace", "n", "karmada-system", "Kubernetes namespace")
flags.StringVar(&opts.StorageClassesName, "storage-classes-name", "", "Kubernetes StorageClasses Name")

3
pkg/karmadactl/cmdinit/kubernetes/deploy.go
View File

@ -121,6 +121,7 @@ type CommandInitOption struct {
CRDs string
ExternalIP string
ExternalDNS string
CertValidity time.Duration
KubeClientSet kubernetes.Interface
CertAndKeyFileData map[string][]byte
RestConfig *rest.Config
@ -218,7 +219,7 @@ func initializeDirectory(path string) error {
// genCerts create ca etcd karmada cert
func (i *CommandInitOption) genCerts() error {
notAfter := time.Now().Add(cert.Duration365d).UTC()
notAfter := time.Now().Add(i.CertValidity).UTC()
etcdServerCertDNS := []string{
"localhost",