Skip to content

Commit

Permalink
fix edge case bug in cert manager config
Browse files Browse the repository at this point in the history
  • Loading branch information
mstein11 committed Jul 31, 2024
1 parent 1657f55 commit c446064
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 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
6 changes: 4 additions & 2 deletions pkg/reconciler/certificate/config/cert_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func TestIssuerRef(t *testing.T) {
Name: CertManagerConfigName,
},
Data: map[string]string{
clusterLocalIssuerRefKey: "kind: ClusterIssuer\nname: system-internal-issuer",
systemInternalIssuerRef: "kind: ClusterIssuer\nname: system-internal-issuer",
},
},
}, {
Expand Down Expand Up @@ -157,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 c446064

Please sign in to comment.