Skip to content

Commit 5ceb2ee

Browse files
author
Simon Emms
committed
[installer]: set all internal certs to 90 days duration
1 parent 320ea98 commit 5ceb2ee

File tree

6 files changed

+16
-21
lines changed

6 files changed

+16
-21
lines changed

installer/pkg/common/constants.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
package common
66

7+
import (
8+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9+
"time"
10+
)
11+
712
// This file exists to break cyclic-dependency errors
813

914
const (
@@ -35,3 +40,7 @@ const (
3540

3641
AnnotationConfigChecksum = "gitpod.io/checksum_config"
3742
)
43+
44+
var (
45+
InternalCertDuration = &metav1.Duration{Duration: time.Hour * 24 * 90}
46+
)

installer/pkg/components/cluster/certmanager.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ func certmanager(ctx *common.RenderContext) ([]runtime.Object, error) {
3939
},
4040
Spec: v1.CertificateSpec{
4141
IsCA: true,
42+
Duration: common.InternalCertDuration,
4243
CommonName: caName,
4344
SecretName: caName,
4445
PrivateKey: &v1.CertificatePrivateKey{

installer/pkg/components/docker-registry/certificate.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ package dockerregistry
66

77
import (
88
"fmt"
9+
"github.com/gitpod-io/gitpod/installer/pkg/common"
910
certmanagerv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
1011
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
11-
"time"
12-
13-
"github.com/gitpod-io/gitpod/installer/pkg/common"
1412
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1513
"k8s.io/apimachinery/pkg/runtime"
1614
"k8s.io/utils/pointer"
@@ -21,8 +19,6 @@ func certificate(ctx *common.RenderContext) ([]runtime.Object, error) {
2119
return nil, nil
2220
}
2321

24-
oneYear := &metav1.Duration{Duration: time.Hour * 24 * 365}
25-
2622
return []runtime.Object{&certmanagerv1.Certificate{
2723
TypeMeta: common.TypeMetaCertificate,
2824
ObjectMeta: metav1.ObjectMeta{
@@ -31,7 +27,7 @@ func certificate(ctx *common.RenderContext) ([]runtime.Object, error) {
3127
Labels: common.DefaultLabels(Component),
3228
},
3329
Spec: certmanagerv1.CertificateSpec{
34-
Duration: oneYear,
30+
Duration: common.InternalCertDuration,
3531
SecretName: BuiltInRegistryCerts,
3632
IssuerRef: cmmeta.ObjectReference{
3733
Name: common.CertManagerCAIssuer,

installer/pkg/components/registry-facade/certificate.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ package registryfacade
66

77
import (
88
"fmt"
9-
"time"
10-
119
certmanagerv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
1210
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
1311

@@ -17,8 +15,6 @@ import (
1715
)
1816

1917
func certificate(ctx *common.RenderContext) ([]runtime.Object, error) {
20-
oneYear := &metav1.Duration{Duration: time.Hour * 24 * 365}
21-
2218
return []runtime.Object{&certmanagerv1.Certificate{
2319
TypeMeta: common.TypeMetaCertificate,
2420
ObjectMeta: metav1.ObjectMeta{
@@ -27,7 +23,7 @@ func certificate(ctx *common.RenderContext) ([]runtime.Object, error) {
2723
Labels: common.DefaultLabels(Component),
2824
},
2925
Spec: certmanagerv1.CertificateSpec{
30-
Duration: oneYear,
26+
Duration: common.InternalCertDuration,
3127
SecretName: common.RegistryFacadeTLSCertSecret,
3228
IssuerRef: cmmeta.ObjectReference{
3329
Name: common.CertManagerCAIssuer,

installer/pkg/components/ws-daemon/tlssecret.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,10 @@ import (
1010
certmanagerv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
1111
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
13-
"time"
14-
1513
"k8s.io/apimachinery/pkg/runtime"
1614
)
1715

1816
func tlssecret(ctx *common.RenderContext) ([]runtime.Object, error) {
19-
oneYear := &metav1.Duration{Duration: time.Hour * 24 * 365}
20-
2117
return []runtime.Object{
2218
&certmanagerv1.Certificate{
2319
TypeMeta: common.TypeMetaCertificate,
@@ -27,7 +23,7 @@ func tlssecret(ctx *common.RenderContext) ([]runtime.Object, error) {
2723
Labels: common.DefaultLabels(Component),
2824
},
2925
Spec: certmanagerv1.CertificateSpec{
30-
Duration: oneYear,
26+
Duration: common.InternalCertDuration,
3127
SecretName: TLSSecretName,
3228
DNSNames: []string{
3329
fmt.Sprintf("gitpod.%s", ctx.Namespace),

installer/pkg/components/ws-manager/tlssecret.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ package wsmanager
66

77
import (
88
"fmt"
9-
"time"
10-
119
"github.com/gitpod-io/gitpod/installer/pkg/common"
1210

1311
certmanagerv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
@@ -32,7 +30,6 @@ func tlssecret(ctx *common.RenderContext) ([]runtime.Object, error) {
3230
Component,
3331
}
3432

35-
sixMonths := &metav1.Duration{Duration: time.Hour * 4380}
3633
issuer := common.CertManagerCAIssuer
3734

3835
return []runtime.Object{
@@ -44,7 +41,7 @@ func tlssecret(ctx *common.RenderContext) ([]runtime.Object, error) {
4441
Labels: common.DefaultLabels(Component),
4542
},
4643
Spec: certmanagerv1.CertificateSpec{
47-
Duration: sixMonths,
44+
Duration: common.InternalCertDuration,
4845
SecretName: TLSSecretNameSecret,
4946
DNSNames: serverAltNames,
5047
IssuerRef: cmmeta.ObjectReference{
@@ -62,7 +59,7 @@ func tlssecret(ctx *common.RenderContext) ([]runtime.Object, error) {
6259
Labels: common.DefaultLabels(Component),
6360
},
6461
Spec: certmanagerv1.CertificateSpec{
65-
Duration: sixMonths,
62+
Duration: common.InternalCertDuration,
6663
SecretName: TLSSecretNameClient,
6764
DNSNames: clientAltNames,
6865
IssuerRef: cmmeta.ObjectReference{

0 commit comments

Comments
 (0)