File tree Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -48,12 +48,6 @@ const (
48
48
49
49
// SystemName is a constant as we want just a single system per namespace
50
50
SystemName = "noobaa"
51
-
52
- // ServiceServingCertCAFile points to OCP default root CA list
53
- ServiceServingCertCAFile = "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
54
-
55
- // InjectedBundleCertCAFile points to OCP root CA to be added to the default root CA list
56
- InjectedBundleCertCAFile = "/etc/ocp-injected-ca-bundle/ca-bundle.crt"
57
51
)
58
52
59
53
// Namespace is the target namespace for locating the noobaa system
Original file line number Diff line number Diff line change @@ -404,9 +404,9 @@ func (r *Reconciler) Reconcile() (reconcile.Result, error) {
404
404
}
405
405
}
406
406
407
- err = util .CombineCaBundle (options .ServiceServingCertCAFile )
407
+ err = util .CombineCaBundle (util .ServiceServingCertCAFile )
408
408
if err == nil {
409
- r .ApplyCAsToPods = options .InjectedBundleCertCAFile
409
+ r .ApplyCAsToPods = util .InjectedBundleCertCAFile
410
410
} else if ! os .IsNotExist (err ) {
411
411
log .Errorf ("❌ NooBaa %q failed to add root CAs to system default" , r .NooBaa .Name )
412
412
res .RequeueAfter = 3 * time .Second
Original file line number Diff line number Diff line change @@ -84,6 +84,12 @@ const (
84
84
85
85
topologyConstraintsEnabledKubeVersion = "1.26.0"
86
86
trueStr = "true"
87
+
88
+ // ServiceServingCertCAFile points to OCP default root CA list
89
+ ServiceServingCertCAFile = "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
90
+
91
+ // InjectedBundleCertCAFile points to OCP root CA to be added to the default root CA list
92
+ InjectedBundleCertCAFile = "/etc/ocp-injected-ca-bundle/ca-bundle.crt"
87
93
)
88
94
89
95
// OAuth2Endpoints holds OAuth2 endpoints information.
@@ -151,7 +157,7 @@ func CombineCaBundle(localCertFile string) error {
151
157
}
152
158
153
159
var certFiles = []string {
154
- "/etc/ocp-injected-ca-bundle/ca-bundle.crt" ,
160
+ InjectedBundleCertCAFile ,
155
161
localCertFile ,
156
162
}
157
163
You can’t perform that action at this time.
0 commit comments