-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29 from ctrought/feat-subject-annotations
Additional support for subject annotations
- Loading branch information
Showing
5 changed files
with
594 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -104,6 +104,15 @@ metadata: | |
cert-manager.io/uri-sans: "spiffe://trustdomain/workload" # Optional, no default | ||
cert-manager.io/private-key-algorithm: "ECDSA" # Optional, defaults to RSA | ||
cert-manager.io/private-key-size: "384" # Optional, defaults to 265 for ECDSA and 2048 for RSA | ||
cert-manager.io/email-sans: "[email protected],[email protected]" # Optional, no default | ||
cert-manager.io/subject-organizations: "company" # Optional, no default | ||
cert-manager.io/subject-organizationalunits: "company division" # Optional, no default | ||
cert-manager.io/subject-countries: "My Country" # Optional, no default | ||
cert-manager.io/subject-provinces: "My Province" # Optional, no default | ||
cert-manager.io/subject-localities: "My City" # Optional, no default | ||
cert-manager.io/subject-postalcodes: "123ABC" # Optional, no default | ||
cert-manager.io/subject-streetaddresses: "1 Example St" # Optional, no default | ||
cert-manager.io/subject-serialnumber: "123456" # Optional, no default | ||
spec: | ||
host: app.service.clustername.domain.com # will be added to the Subject Alternative Names of the CertificateRequest | ||
port: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
Copyright 2022 The cert-manager Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package controller | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/go-logr/logr" | ||
routev1 "github.com/openshift/api/route/v1" | ||
"github.com/stretchr/testify/assert" | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
) | ||
|
||
func Test_shouldReconcile(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
given *routev1.Route | ||
want bool | ||
}{ | ||
{ | ||
name: "should reconcile with cert-manager.io/issuer-name annotation", | ||
given: &routev1.Route{ObjectMeta: metav1.ObjectMeta{ | ||
Annotations: map[string]string{ | ||
"cert-manager.io/issuer-name": "test", | ||
}}, | ||
}, | ||
want: true, | ||
}, | ||
{ | ||
name: "should sync with cert-manager.io/issuer annotation", | ||
given: &routev1.Route{ObjectMeta: metav1.ObjectMeta{ | ||
Annotations: map[string]string{ | ||
"cert-manager.io/issuer": "test", | ||
}}, | ||
}, | ||
want: true, | ||
}, | ||
{ | ||
name: "should not sync when Route owned by Ingress", | ||
given: &routev1.Route{ObjectMeta: metav1.ObjectMeta{ | ||
OwnerReferences: []metav1.OwnerReference{ | ||
{ | ||
Kind: "Ingress", | ||
}, | ||
}}, | ||
}, | ||
want: false, | ||
}, | ||
{ | ||
name: "should not sync when Route owned by Ingress", | ||
given: &routev1.Route{ObjectMeta: metav1.ObjectMeta{ | ||
OwnerReferences: []metav1.OwnerReference{ | ||
{ | ||
Kind: "Ingress", | ||
}, | ||
}}, | ||
}, | ||
want: false, | ||
}, | ||
{ | ||
name: "should not sync when no annotation is found", | ||
given: &routev1.Route{ObjectMeta: metav1.ObjectMeta{}}, | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
got := shouldSync(logr.Discard(), tt.given) | ||
assert.Equal(t, tt.want, got) | ||
}) | ||
} | ||
} |
Oops, something went wrong.