Skip to content

Commit 710fcf5

Browse files
Merge pull request #16863 from deads2k/server-49-validation
Automatic merge from submit-queue (batch tested with PRs 16943, 16872, 16916, 16863, 16925). warn on missing service cert signer in oadm diagnostics Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1501952 Updates master-config.yaml validation to warn on missing service serving signer cert configuration. @mrobson ``` [deads@deads-02 origin]$ oc adm diagnostics --master-config=openshift.local.config/master/master-config.yaml MasterConfigCheck [Note] Determining if client configuration exists for client/cluster diagnostics Info: Successfully read a client config file at '/home/deads/.kube/config' [Note] Performing systemd discovery [Note] Running diagnostic: MasterConfigCheck Description: Check the master config file WARN: [DH0005 from diagnostic MasterConfigCheck@openshift/origin/pkg/diagnostics/host/check_master_config.go:52] Validation of master config file 'openshift.local.config/master/master-config.yaml' warned: assetConfig.loggingPublicURL: Invalid value: "": required to view aggregated container logs in the console assetConfig.metricsPublicURL: Invalid value: "": required to view cluster metrics in the console controllerConfig.serviceServingCert.signer: Required value: required for the service serving cert signer; automatic serving certificate signing will fail [Note] Summary of diagnostics execution (version v3.7.0-alpha.1+05f812f-1107-dirty): [Note] Warnings seen: 1 ```
2 parents 166e131 + d8b6baa commit 710fcf5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

pkg/cmd/server/api/validation/master.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,9 @@ func ValidateControllerConfig(config api.ControllerConfig, fldPath *field.Path)
336336
validationResults.AddErrors(field.Invalid(fldPath.Child("election", "lockResource", "resource"), election.LockResource.Resource, "may not be empty"))
337337
}
338338
}
339-
if config.ServiceServingCert.Signer != nil {
339+
if config.ServiceServingCert.Signer == nil {
340+
validationResults.AddWarnings(field.Required(fldPath.Child("serviceServingCert", "signer"), "required for the service serving cert signer; automatic serving certificate signing will fail"))
341+
} else {
340342
validationResults.AddErrors(ValidateCertInfo(*config.ServiceServingCert.Signer, true, fldPath.Child("serviceServingCert.signer"))...)
341343
}
342344

pkg/cmd/server/api/validation/master_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ func TestValidateAdmissionPluginConfigConflicts(t *testing.T) {
401401
// these fields have warnings in the empty case
402402
defaultWarningFields := sets.NewString(
403403
"serviceAccountConfig.managedNames", "serviceAccountConfig.publicKeyFiles", "serviceAccountConfig.privateKeyFile", "serviceAccountConfig.masterCA",
404-
"projectConfig.securityAllocator", "kubernetesMasterConfig.proxyClientInfo", "auditConfig.auditFilePath", "aggregatorConfig.proxyClientInfo")
404+
"projectConfig.securityAllocator", "kubernetesMasterConfig.proxyClientInfo", "auditConfig.auditFilePath", "aggregatorConfig.proxyClientInfo", "controllerConfig.serviceServingCert.signer")
405405

406406
for _, tc := range testCases {
407407
results := ValidateMasterConfig(&tc.options, nil)

0 commit comments

Comments
 (0)