Skip to content

Commit 8ce0047

Browse files
Merge pull request #577 from marun/4.2-automated-rotation
Bug 1774156: 4.2 cherry-picks in support of automated service ca rotation
2 parents d4a64ec + 4f4965b commit 8ce0047

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

servicecertsigner/v1alpha1/types.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ type ServiceServingCertSignerConfig struct {
2222

2323
// signer holds the signing information used to automatically sign serving certificates.
2424
Signer configv1.CertInfo `json:"signer"`
25+
26+
// IntermediateCertFile is the name of a file containing a
27+
// PEM-encoded certificate. Only required if the initial CA has
28+
// been rotated. The certificate should consist of the public key
29+
// of the current CA signed by the private key of the previous
30+
// CA. When included with a serving cert generated by the current
31+
// CA, this certificate should allow clients with a stale CA bundle
32+
// to trust the serving cert.
33+
// +optional
34+
IntermediateCertFile string `json:"intermediateCertFile"`
2535
}
2636

2737
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

servicecertsigner/v1alpha1/zz_generated.swagger_doc_generated.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)