Skip to content

Commit 65dca8d

Browse files
irbyirby
committed
chore: Fix typo & fix repo namespace issue on e2e tests
1 parent 96324c3 commit 65dca8d

File tree

6 files changed

+27
-32
lines changed

6 files changed

+27
-32
lines changed

‎api/v1alpha1/issuer_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ type IssuerSpec struct {
4747
APIPath string `json:"apiPath,omitempty"`
4848

4949
// EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
50-
// If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
50+
// If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
5151
// If EnrollmentPatternId and EnrollmentPatternName are both specified, EnrollmentPatternId will take precedence.
5252
// Enrollment will fail if the specified template is not compatible with the enrollment pattern.
5353
// Refer to the Keyfactor Command documentation for more information.
5454
EnrollmentPatternId int32 `json:"enrollmentPatternId,omitempty"`
5555

5656
// EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
57-
// If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
57+
// If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
5858
// If EnrollmentPatternId and EnrollmentPatternName are both specified, EnrollmentPatternId will take precedence.
5959
// Enrollment will fail if the specified template is not compatible with the enrollment pattern.
6060
// Refer to the Keyfactor Command documentation for more information.
6161
EnrollmentPatternName string `json:"enrollmentPatternName,omitempty"`
6262

6363
// Deprecated. CertificateTemplate is the name of the certificate template to use. If using Keyfactor Command 25.1 or later, use EnrollmentPatternName or EnrollmentPatternId instead.
64-
// If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
64+
// If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
6565
// Enrollment will fail if the specified template is not compatible with the enrollment pattern.
6666
// Refer to the Keyfactor Command documentation for more information.
6767
CertificateTemplate string `json:"certificateTemplate,omitempty"`

‎config/crd/bases/command-issuer.keyfactor.com_clusterissuers.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,24 @@ spec:
7171
enrollmentPatternId:
7272
description: |-
7373
EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
74-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
75-
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
74+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
75+
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precedence.
7676
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
7777
Refer to the Keyfactor Command documentation for more information.
7878
type: integer
7979
format: int32
8080
enrollmentPatternName:
8181
description: |-
8282
EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
83-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
84-
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
83+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
84+
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precedence.
8585
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
8686
Refer to the Keyfactor Command documentation for more information.
8787
type: string
8888
certificateTemplate:
8989
description: |-
9090
CertificateTemplate is the name of the certificate template to use. Deprecated in favor of EnrollmentPattern as of Keyfactor Command 25.1.
91-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
91+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
9292
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
9393
Refer to the Keyfactor Command documentation for more information.
9494
type: string

‎config/crd/bases/command-issuer.keyfactor.com_issuers.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,24 @@ spec:
7171
enrollmentPatternId:
7272
description: |-
7373
EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
74-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
75-
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
74+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
75+
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precedence.
7676
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
7777
Refer to the Keyfactor Command documentation for more information.
7878
type: integer
7979
format: int32
8080
enrollmentPatternName:
8181
description: |-
8282
EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
83-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
84-
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
83+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
84+
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precedence.
8585
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
8686
Refer to the Keyfactor Command documentation for more information.
8787
type: string
8888
certificateTemplate:
8989
description: |-
9090
CertificateTemplate is the name of the certificate template to use. Deprecated in favor of EnrollmentPattern as of Keyfactor Command 25.1.
91-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
91+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
9292
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
9393
Refer to the Keyfactor Command documentation for more information.
9494
type: string

‎deploy/charts/command-cert-manager-issuer/templates/crds/clusterissuers.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,24 @@ spec:
6565
enrollmentPatternId:
6666
description: |-
6767
EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
68-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
69-
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
68+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
69+
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precedence.
7070
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
7171
Refer to the Keyfactor Command documentation for more information.
7272
type: integer
7373
format: int32
7474
enrollmentPatternName:
7575
description: |-
7676
EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
77-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
78-
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
77+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
78+
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precedence.
7979
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
8080
Refer to the Keyfactor Command documentation for more information.
8181
type: string
8282
certificateTemplate:
8383
description: |-
8484
CertificateTemplate is the name of the certificate template to use. Deprecated in favor of EnrollmentPattern as of Keyfactor Command 25.1.
85-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
85+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
8686
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
8787
Refer to the Keyfactor Command documentation for more information.
8888
type: string

‎deploy/charts/command-cert-manager-issuer/templates/crds/issuers.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,24 @@ spec:
6565
enrollmentPatternId:
6666
description: |-
6767
EnrollmentPatternId is the ID of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
68-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
69-
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
68+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
69+
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precedence.
7070
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
7171
Refer to the Keyfactor Command documentation for more information.
7272
type: integer
7373
format: int32
7474
enrollmentPatternName:
7575
description: |-
7676
EnrollmentPatternName is the name of the enrollment pattern to use. Supported in Keyfactor Command 25.1 and later.
77-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
78-
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precendence.
77+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
78+
If both enrollmentPatternId and enrollmentPatternName are specified, enrollmentPatternId will take precedence.
7979
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
8080
Refer to the Keyfactor Command documentation for more information.
8181
type: string
8282
certificateTemplate:
8383
description: |-
8484
CertificateTemplate is the name of the certificate template to use. Deprecated in favor of EnrollmentPattern as of Keyfactor Command 25.1.
85-
If both enrollment pattern and certificate template are specified, enrollment pattern will take precendence.
85+
If both enrollment pattern and certificate template are specified, enrollment pattern will take precedence.
8686
Enrollment will fail if the specified template is not compatible with the enrollment pattern.
8787
Refer to the Keyfactor Command documentation for more information.
8888
type: string

‎e2e/run_tests.sh‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ install_cert_manager_issuer() {
198198

199199
# Only set the image repository parameter if we are deploying locally
200200
if [[ "$IS_LOCAL_DEPLOYMENT" == "true" ]]; then
201-
IMAGE_REPO_PARAM="--set image.repository=${IMAGE_NAME}"
201+
IMAGE_REPO_PARAM="--set image.repository=${IMAGE_REPO}/${IMAGE_NAME}"
202202
else
203203
IMAGE_REPO_PARAM=""
204204
fi
@@ -382,14 +382,6 @@ add_issuer_specification_field() {
382382

383383
echo "Adding issuer specification field: $field_name with value: $field_value"
384384

385-
resolved_value=""
386-
387-
if [[ $field_value =~ ^[0-9]+$ ]]; then
388-
resolved_value=$field_value
389-
else
390-
resolved_value="\"$field_value\""
391-
fi
392-
393385
kubectl -n "$ISSUER_NAMESPACE" patch $ISSUER_CRD_FQTN $ISSUER_CR_NAME --type='json' -p="[{\"op\": \"add\", \"path\": \"/spec/$field_name\", \"value\": $field_value}]"
394386

395387
echo "✅ Issuer specification field added successfully."
@@ -464,6 +456,9 @@ if "$IS_LOCAL_DEPLOYMENT" = "true"; then
464456
echo "🐳 Building ${FULL_IMAGE_NAME} Docker image..."
465457
docker build -t ${FULL_IMAGE_NAME} .
466458
echo "✅ Docker image built successfully"
459+
460+
echo "📦 Listing Docker images..."
461+
docker images --format "table {{.Repository}}\t{{.Tag}}\t{{.CreatedAt}}\t{{.Size}}" | head -11
467462
fi
468463

469464
# 5. Deploy the command-cert-manager-issuer Helm chart if not exists

0 commit comments

Comments
 (0)