Skip to content

Commit c0de763

Browse files
gnyahaygnyahay
committed
Render endpoint hostnames as a formal FQDN
Signed-off-by: Greg Nyahay <greg.nyahay@anchore.com>
1 parent 1594f24 commit c0de763

13 files changed

Lines changed: 30 additions & 30 deletions

‎stable/enterprise/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: enterprise
3-
version: "3.10.0"
3+
version: "3.11.0"
44
appVersion: "5.18.0"
55
kubeVersion: 1.23.x - 1.32.x || 1.23.x-x - 1.32.x-x
66
description: |

‎stable/enterprise/templates/_common.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ When calling this template, .component can be included in the context for compon
120120
{{- end }}
121121

122122
- name: ANCHORE_ENDPOINT_HOSTNAME
123-
value: {{ $serviceName }}.{{- if $domainSuffix -}}{{ $domainSuffix }}{{- else -}}{{ .Release.Namespace }}.svc.cluster.local{{- end }}
123+
value: {{ $serviceName }}.{{- if $domainSuffix -}}{{ $domainSuffix }}{{- else -}}{{ .Release.Namespace }}.svc.cluster.local.{{- end }}
124124

125125
{{- with (index .Values (print $component)).service }}
126126
- name: ANCHORE_PORT

‎stable/enterprise/tests/__snapshot__/prehook_upgrade_resources_test.yaml.snap‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ migration job should match snapshot:
1414
- name: bar
1515
value: baz
1616
- name: ANCHORE_ENDPOINT_HOSTNAME
17-
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local
17+
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local.
1818
- name: ANCHORE_PORT
1919
value: "null"
2020
- name: ANCHORE_HOST_ID
@@ -82,7 +82,7 @@ migration job should match snapshot:
8282
- name: bar
8383
value: baz
8484
- name: ANCHORE_ENDPOINT_HOSTNAME
85-
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local
85+
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local.
8686
- name: ANCHORE_PORT
8787
value: "null"
8888
- name: ANCHORE_HOST_ID
@@ -136,7 +136,7 @@ migration job should match snapshot analysisArchiveMigration and objectStoreMigr
136136
- name: bar
137137
value: baz
138138
- name: ANCHORE_ENDPOINT_HOSTNAME
139-
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local
139+
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local.
140140
- name: ANCHORE_PORT
141141
value: "null"
142142
- name: ANCHORE_HOST_ID
@@ -204,7 +204,7 @@ migration job should match snapshot analysisArchiveMigration and objectStoreMigr
204204
- name: bar
205205
value: baz
206206
- name: ANCHORE_ENDPOINT_HOSTNAME
207-
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local
207+
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local.
208208
- name: ANCHORE_PORT
209209
value: "null"
210210
- name: ANCHORE_HOST_ID
@@ -256,7 +256,7 @@ migration job should match snapshot analysisArchiveMigration to true:
256256
- name: bar
257257
value: baz
258258
- name: ANCHORE_ENDPOINT_HOSTNAME
259-
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local
259+
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local.
260260
- name: ANCHORE_PORT
261261
value: "null"
262262
- name: ANCHORE_HOST_ID
@@ -324,7 +324,7 @@ migration job should match snapshot analysisArchiveMigration to true:
324324
- name: bar
325325
value: baz
326326
- name: ANCHORE_ENDPOINT_HOSTNAME
327-
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local
327+
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local.
328328
- name: ANCHORE_PORT
329329
value: "null"
330330
- name: ANCHORE_HOST_ID
@@ -375,7 +375,7 @@ migration job should match snapshot objectStoreMigration to true:
375375
- name: bar
376376
value: baz
377377
- name: ANCHORE_ENDPOINT_HOSTNAME
378-
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local
378+
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local.
379379
- name: ANCHORE_PORT
380380
value: "null"
381381
- name: ANCHORE_HOST_ID
@@ -443,7 +443,7 @@ migration job should match snapshot objectStoreMigration to true:
443443
- name: bar
444444
value: baz
445445
- name: ANCHORE_ENDPOINT_HOSTNAME
446-
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local
446+
value: test-release-enterprise-999-osaa-migration-job.test-namespace.svc.cluster.local.
447447
- name: ANCHORE_PORT
448448
value: "null"
449449
- name: ANCHORE_HOST_ID
@@ -614,7 +614,7 @@ should render proper initContainers:
614614
- name: bar
615615
value: baz
616616
- name: ANCHORE_ENDPOINT_HOSTNAME
617-
value: test-release-enterprise-999-upgrade.test-namespace.svc.cluster.local
617+
value: test-release-enterprise-999-upgrade.test-namespace.svc.cluster.local.
618618
- name: ANCHORE_PORT
619619
value: "null"
620620
- name: ANCHORE_HOST_ID

‎stable/enterprise/tests/analyzer_resources_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ tests:
221221
path: spec.template.spec.containers[0].env
222222
content:
223223
name: ANCHORE_ENDPOINT_HOSTNAME
224-
value: test-release-enterprise-analyzer.test-namespace.svc.cluster.local
224+
value: test-release-enterprise-analyzer.test-namespace.svc.cluster.local.
225225
count: 1
226226
- contains:
227227
path: spec.template.spec.containers[0].env
@@ -411,7 +411,7 @@ tests:
411411
path: spec.template.spec.containers[0].env
412412
content:
413413
name: ANCHORE_ENDPOINT_HOSTNAME
414-
value: test-release-enterprise-analyzer.test-namespace.svc.cluster.local
414+
value: test-release-enterprise-analyzer.test-namespace.svc.cluster.local.
415415

416416
- it: should render ANCHORE_ENDPOINT_HOSTNAME with toplevel domainSuffix
417417
template: analyzer_deployment.yaml

‎stable/enterprise/tests/api_resources_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ tests:
203203
path: spec.template.spec.containers[0].env
204204
content:
205205
name: ANCHORE_ENDPOINT_HOSTNAME
206-
value: test-release-enterprise-api.test-namespace.svc.cluster.local
206+
value: test-release-enterprise-api.test-namespace.svc.cluster.local.
207207
count: 1
208208
- contains:
209209
path: spec.template.spec.containers[0].env
@@ -508,7 +508,7 @@ tests:
508508
path: spec.template.spec.containers[0].env
509509
content:
510510
name: ANCHORE_ENDPOINT_HOSTNAME
511-
value: test-release-enterprise-api.test-namespace.svc.cluster.local
511+
value: test-release-enterprise-api.test-namespace.svc.cluster.local.
512512

513513
- it: should render ANCHORE_ENDPOINT_HOSTNAME with toplevel domainSuffix
514514
template: api_deployment.yaml

‎stable/enterprise/tests/catalog_resources_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ tests:
236236
path: spec.template.spec.containers[0].env
237237
content:
238238
name: ANCHORE_ENDPOINT_HOSTNAME
239-
value: test-release-enterprise-catalog.test-namespace.svc.cluster.local
239+
value: test-release-enterprise-catalog.test-namespace.svc.cluster.local.
240240
count: 1
241241
- contains:
242242
path: spec.template.spec.containers[0].env
@@ -521,7 +521,7 @@ tests:
521521
path: spec.template.spec.containers[0].env
522522
content:
523523
name: ANCHORE_ENDPOINT_HOSTNAME
524-
value: test-release-enterprise-catalog.test-namespace.svc.cluster.local
524+
value: test-release-enterprise-catalog.test-namespace.svc.cluster.local.
525525

526526
- it: should render ANCHORE_ENDPOINT_HOSTNAME with toplevel domainSuffix
527527
template: catalog_deployment.yaml

‎stable/enterprise/tests/datasyncer_resources_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ tests:
242242
path: spec.template.spec.containers[0].env[0]
243243
content:
244244
name: ANCHORE_ENDPOINT_HOSTNAME
245-
value: test-release-enterprise-datasyncer.test-namespace.svc.cluster.local
245+
value: test-release-enterprise-datasyncer.test-namespace.svc.cluster.local.
246246
count: 1
247247
- isSubset:
248248
path: spec.template.spec.containers[0].env[1]

‎stable/enterprise/tests/notifications_resources_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ tests:
178178
path: spec.template.spec.containers[0].env
179179
content:
180180
name: ANCHORE_ENDPOINT_HOSTNAME
181-
value: test-release-enterprise-notifications.test-namespace.svc.cluster.local
181+
value: test-release-enterprise-notifications.test-namespace.svc.cluster.local.
182182
count: 1
183183
- contains:
184184
path: spec.template.spec.containers[0].env
@@ -426,7 +426,7 @@ tests:
426426
path: spec.template.spec.containers[0].env
427427
content:
428428
name: ANCHORE_ENDPOINT_HOSTNAME
429-
value: test-release-enterprise-notifications.test-namespace.svc.cluster.local
429+
value: test-release-enterprise-notifications.test-namespace.svc.cluster.local.
430430

431431
- it: should render ANCHORE_ENDPOINT_HOSTNAME with toplevel domainSuffix
432432
template: notifications_deployment.yaml

‎stable/enterprise/tests/policyengine_resources_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ tests:
220220
path: spec.template.spec.containers[0].env
221221
content:
222222
name: ANCHORE_ENDPOINT_HOSTNAME
223-
value: test-release-enterprise-policy.test-namespace.svc.cluster.local
223+
value: test-release-enterprise-policy.test-namespace.svc.cluster.local.
224224
count: 1
225225
- contains:
226226
path: spec.template.spec.containers[0].env
@@ -480,7 +480,7 @@ tests:
480480
path: spec.template.spec.containers[0].env
481481
content:
482482
name: ANCHORE_ENDPOINT_HOSTNAME
483-
value: test-release-enterprise-policy.test-namespace.svc.cluster.local
483+
value: test-release-enterprise-policy.test-namespace.svc.cluster.local.
484484

485485
- it: should render ANCHORE_ENDPOINT_HOSTNAME with toplevel domainSuffix
486486
template: policyengine_deployment.yaml

‎stable/enterprise/tests/reports_resources_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ tests:
176176
path: spec.template.spec.containers[0].env
177177
content:
178178
name: ANCHORE_ENDPOINT_HOSTNAME
179-
value: test-release-enterprise-reports.test-namespace.svc.cluster.local
179+
value: test-release-enterprise-reports.test-namespace.svc.cluster.local.
180180
count: 1
181181
- contains:
182182
path: spec.template.spec.containers[0].env
@@ -539,7 +539,7 @@ tests:
539539
path: spec.template.spec.containers[0].env
540540
content:
541541
name: ANCHORE_ENDPOINT_HOSTNAME
542-
value: test-release-enterprise-reports.test-namespace.svc.cluster.local
542+
value: test-release-enterprise-reports.test-namespace.svc.cluster.local.
543543

544544
- it: should render ANCHORE_ENDPOINT_HOSTNAME with toplevel domainSuffix
545545
template: reports_deployment.yaml

0 commit comments

Comments
 (0)