Skip to content

Commit

Permalink
Fix bug in cert manager config (#15434)
Browse files Browse the repository at this point in the history
* add test to cover cert manager config edge case

* fix edge case bug in cert manager config
  • Loading branch information
mstein11 authored Aug 1, 2024
1 parent 222065d commit cac5e63
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pkg/reconciler/certificate/config/cert_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ type CertManagerConfig struct {
func NewCertManagerConfigFromConfigMap(configMap *corev1.ConfigMap) (*CertManagerConfig, error) {
// Use Knative self-signed ClusterIssuer as default
config := &CertManagerConfig{
IssuerRef: knativeSelfSignedIssuer,
ClusterLocalIssuerRef: knativeSelfSignedIssuer,
SystemInternalIssuerRef: knativeSelfSignedIssuer,
IssuerRef: knativeSelfSignedIssuer.DeepCopy(),
ClusterLocalIssuerRef: knativeSelfSignedIssuer.DeepCopy(),
SystemInternalIssuerRef: knativeSelfSignedIssuer.DeepCopy(),
}

if v, ok := configMap.Data[issuerRefKey]; ok {
Expand Down
32 changes: 31 additions & 1 deletion pkg/reconciler/certificate/config/cert_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,41 @@ func TestIssuerRef(t *testing.T) {
Kind: "ClusterIssuer",
},
},
config: &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Namespace: system.Namespace(),
Name: CertManagerConfigName,
},
Data: map[string]string{
systemInternalIssuerRef: "kind: ClusterIssuer\nname: system-internal-issuer",
},
},
}, {
name: "all issuer valid",
wantErr: false,
wantConfig: &CertManagerConfig{
IssuerRef: &cmmeta.ObjectReference{
Name: "letsencrypt-issuer",
Kind: "ClusterIssuer",
},
ClusterLocalIssuerRef: &cmmeta.ObjectReference{
Name: "system-internal-issuer",
Kind: "ClusterIssuer",
},
SystemInternalIssuerRef: &cmmeta.ObjectReference{
Name: "system-internal-issuer",
Kind: "ClusterIssuer",
},
},
config: &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Namespace: system.Namespace(),
Name: CertManagerConfigName,
},
Data: map[string]string{
clusterLocalIssuerRefKey: "kind: ClusterIssuer\nname: system-internal-issuer",
systemInternalIssuerRef: "kind: ClusterIssuer\nname: system-internal-issuer",
issuerRefKey: "kind: ClusterIssuer\nname: letsencrypt-issuer",
},
},
}}
Expand All @@ -129,7 +157,9 @@ func TestIssuerRef(t *testing.T) {
if (err != nil) != tt.wantErr {
t.Fatalf("Test: %q; NewCertManagerConfigFromConfigMap() error = %v, WantErr %v", tt.name, err, tt.wantErr)
}
if diff := cmp.Diff(actualConfig, tt.wantConfig); diff != "" {

if !cmp.Equal(actualConfig, tt.wantConfig) {
t.Log(cmp.Diff(actualConfig, tt.wantConfig))
t.Fatalf("Want %v, but got %v", tt.wantConfig, actualConfig)
}
})
Expand Down

0 comments on commit cac5e63

Please sign in to comment.