-
Notifications
You must be signed in to change notification settings - Fork 49
/
cluster-kube-apiserver-operator.patch
183 lines (182 loc) · 10.5 KB
/
cluster-kube-apiserver-operator.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
diff --git a/pkg/operator/certrotationcontroller/certrotationcontroller.go b/pkg/operator/certrotationcontroller/certrotationcontroller.go
index 1bf5d3224..a28ce71ed 100644
--- a/pkg/operator/certrotationcontroller/certrotationcontroller.go
+++ b/pkg/operator/certrotationcontroller/certrotationcontroller.go
@@ -129,8 +129,8 @@ func newCertRotationController(
certrotation.RotatedSigningCASecret{
Namespace: operatorclient.OperatorNamespace,
Name: "aggregator-client-signer",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
Informer: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets(),
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
@@ -148,8 +148,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.TargetNamespace,
Name: "aggregator-client",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ClientRotation{
UserInfo: &user.DefaultInfo{Name: "system:openshift-aggregator"},
@@ -188,8 +188,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.TargetNamespace,
Name: "kubelet-client",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ClientRotation{
UserInfo: &user.DefaultInfo{Name: "system:kube-apiserver", Groups: []string{"kube-master"}},
@@ -228,8 +228,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.TargetNamespace,
Name: "localhost-serving-cert-certkey",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ServingRotation{
Hostnames: func() []string { return []string{"localhost", "127.0.0.1"} },
@@ -268,8 +268,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.TargetNamespace,
Name: "service-network-serving-certkey",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ServingRotation{
Hostnames: ret.serviceNetwork.GetHostnames,
@@ -309,8 +309,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.TargetNamespace,
Name: "external-loadbalancer-serving-certkey",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ServingRotation{
Hostnames: ret.externalLoadBalancer.GetHostnames,
@@ -350,8 +350,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.TargetNamespace,
Name: "internal-loadbalancer-serving-certkey",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ServingRotation{
Hostnames: ret.internalLoadBalancer.GetHostnames,
@@ -410,8 +410,8 @@ func newCertRotationController(
certrotation.RotatedSigningCASecret{
Namespace: operatorclient.OperatorNamespace,
Name: "kube-control-plane-signer",
- Validity: 60 * defaultRotationDay,
- Refresh: 30 * defaultRotationDay,
+ Validity: 2 * 365 * defaultRotationDay,
+ Refresh: 365 * defaultRotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
Informer: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets(),
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
@@ -429,8 +429,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.GlobalMachineSpecifiedConfigNamespace,
Name: "kube-controller-manager-client-cert-key",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ClientRotation{
UserInfo: &user.DefaultInfo{Name: "system:kube-controller-manager"},
@@ -450,8 +450,8 @@ func newCertRotationController(
certrotation.RotatedSigningCASecret{
Namespace: operatorclient.OperatorNamespace,
Name: "kube-control-plane-signer",
- Validity: 60 * defaultRotationDay,
- Refresh: 30 * defaultRotationDay,
+ Validity: 2 * 365 * defaultRotationDay,
+ Refresh: 365 * defaultRotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
Informer: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets(),
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
@@ -469,8 +469,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.GlobalMachineSpecifiedConfigNamespace,
Name: "kube-scheduler-client-cert-key",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ClientRotation{
UserInfo: &user.DefaultInfo{Name: "system:kube-scheduler"},
@@ -490,8 +490,8 @@ func newCertRotationController(
certrotation.RotatedSigningCASecret{
Namespace: operatorclient.OperatorNamespace,
Name: "kube-control-plane-signer",
- Validity: 60 * defaultRotationDay,
- Refresh: 30 * defaultRotationDay,
+ Validity: 2 * 365 * defaultRotationDay,
+ Refresh: 365 * defaultRotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
Informer: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets(),
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
@@ -509,8 +509,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.TargetNamespace,
Name: "control-plane-node-admin-client-cert-key",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ClientRotation{
UserInfo: &user.DefaultInfo{Name: "system:control-plane-node-admin", Groups: []string{"system:masters"}},
@@ -530,8 +530,8 @@ func newCertRotationController(
certrotation.RotatedSigningCASecret{
Namespace: operatorclient.OperatorNamespace,
Name: "kube-control-plane-signer",
- Validity: 60 * defaultRotationDay,
- Refresh: 30 * defaultRotationDay,
+ Validity: 2 * 365 * defaultRotationDay,
+ Refresh: 365 * defaultRotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
Informer: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets(),
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
@@ -549,8 +549,8 @@ func newCertRotationController(
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: operatorclient.TargetNamespace,
Name: "check-endpoints-client-cert-key",
- Validity: 30 * rotationDay,
- Refresh: 15 * rotationDay,
+ Validity: 365 * rotationDay,
+ Refresh: 180 * rotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ClientRotation{
UserInfo: &user.DefaultInfo{Name: "system:serviceaccount:openshift-kube-apiserver:check-endpoints"},
@@ -592,9 +592,9 @@ func newCertRotationController(
// This needs to live longer then control plane certs so there is high chance that if a cluster breaks
// because of expired certs these are still valid to use for collecting data using localhost-recovery
// endpoint with long lived serving certs for localhost.
- Validity: 120 * defaultRotationDay,
- // We rotate sooner so certs are always valid for 90 days (30 days more then kube-control-plane-signer)
- Refresh: 30 * defaultRotationDay,
+ Validity: 3 * 365 * defaultRotationDay,
+ // We rotate sooner so certs are always valid for 90 days (365 days more then kube-control-plane-signer)
+ Refresh: 365 * defaultRotationDay,
RefreshOnlyWhenExpired: refreshOnlyWhenExpired,
CertCreator: &certrotation.ClientRotation{
UserInfo: &user.DefaultInfo{