Skip to content

Commit 42a3373

Browse files
lsubashpchand20
lsubash
and
pchand20
authored
Cluster domain update (#156)
Signed-off-by: Subash Lakkimsetti <subash.lakkimsetti@intel.com> Co-authored-by: pchandra <prakash1.chandra@intel.com>
1 parent c2b166c commit 42a3373

File tree

18 files changed

+53
-53
lines changed

18 files changed

+53
-53
lines changed

‎helm/attestation-manager/templates/deployment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ spec:
5454
protocol: TCP
5555
env:
5656
- name: AAS_URL
57-
value: "https://aas.{{ .Release.Namespace }}.svc.cluster.local"
57+
value: "https://aas.{{ .Release.Namespace }}.svc"
5858
- name: AAS_PORT
5959
value: "{{ .Values.env.aasPort }}"
6060
- name: CMS_URL
61-
value: "https://cms.{{ .Release.Namespace }}.svc.cluster.local"
61+
value: "https://cms.{{ .Release.Namespace }}.svc"
6262
- name: CMS_PORT
6363
value: "{{ .Values.env.cmsPort }}"
6464
- name: HVS_URL
65-
value: "https://hvs.{{ .Release.Namespace }}.svc.cluster.local"
65+
value: "https://hvs.{{ .Release.Namespace }}.svc"
6666
- name: HVS_PORT
6767
value: "{{ .Values.env.hvsPort }}"
6868
- name: TCHOSTNAME

‎helm/attestation-verifier/charts/aas/templates/configmap.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ metadata:
66
name: {{ include "factory.name" . }}
77
namespace: {{ .Release.Namespace }}
88
data:
9-
CMS_BASE_URL: https://{{ .Values.dependentServices.cms }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.cms.containerPort }}/cms/v1
10-
AAS_DB_HOSTNAME: {{ include "factory.name" . }}db.{{ .Release.Namespace }}.svc.cluster.local
9+
CMS_BASE_URL: https://{{ .Values.dependentServices.cms }}.{{ .Release.Namespace }}.svc:{{ .Values.service.cms.containerPort }}/cms/v1
10+
AAS_DB_HOSTNAME: {{ include "factory.name" . }}db.{{ .Release.Namespace }}.svc
1111
AAS_DB_PORT: {{ .Values.config.dbPort | quote }}
1212
AAS_DB_NAME: {{ .Values.config.dbName }}
1313
AAS_DB_SSLMODE: {{ .Values.config.dbSSLMode }}
1414
AAS_DB_SSLCERT: {{ .Values.config.dbSSLCert }}
1515
{{- if .Values.global }}
16-
SAN_LIST: {{ .Values.global.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc.cluster.local
16+
SAN_LIST: {{ .Values.global.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc
1717
{{- else }}
18-
SAN_LIST: {{ .Values.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc.cluster.local
18+
SAN_LIST: {{ .Values.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc
1919
{{- end }}
2020
CREATE_CREDENTIALS: "{{ .Values.config.createCredentials }}"

‎helm/attestation-verifier/charts/aas/templates/init-job.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
{{ include "factory.imageInitContainer" . | nindent 10 | trim }}
3636
env:
3737
- name: URL
38-
value: https://{{ .Values.dependentServices.cms }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.cms.containerPort }}/cms/v1/version
38+
value: https://{{ .Values.dependentServices.cms }}.{{ .Release.Namespace }}.svc:{{ .Values.service.cms.containerPort }}/cms/v1/version
3939
- name: VERSION
4040
value: {{.Chart.AppVersion }}
4141
- name: DEPENDENT_SERVICE_NAME

‎helm/attestation-verifier/charts/aasdb-cert-generator/templates/job.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
cd /tmp/certs/ &&
3636
echo '{ "hosts": [{{- if .Values.global }}"{{- if .Values.global.controlPlaneHostname }}{{ .Values.global.controlPlaneHostname }}{{- end }}"{{- else }}"{{ .Values.controlPlaneHostname }}"{{- end }}],"CN": "Attestation Verifier Self Sign Cert","key": {"algo": "rsa", "size": 4096}}' > ca-csr.json &&
3737
cfssl gencert -initca ca-csr.json | cfssljson -bare ca - &&
38-
echo '{"CN":"AAS DB TLS Certificate","hosts":["aasdb.{{ .Release.Namespace }}.svc.cluster.local "],"key":{"algo":"rsa","size":4096}}' | cfssl gencert -ca=ca.pem -ca-key=ca-key.pem -profile=server -hostname="aasdb.{{ .Release.Namespace }}.svc.cluster.local" - | cfssljson -bare aasdb-server
38+
echo '{"CN":"AAS DB TLS Certificate","hosts":["aasdb.{{ .Release.Namespace }}.svc "],"key":{"algo":"rsa","size":4096}}' | cfssl gencert -ca=ca.pem -ca-key=ca-key.pem -profile=server -hostname="aasdb.{{ .Release.Namespace }}.svc" - | cfssljson -bare aasdb-server
3939
volumeMounts:
4040
- name: cert-volume
4141
mountPath: /tmp/certs

‎helm/attestation-verifier/charts/cms/templates/configmap.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ metadata:
77
namespace: {{ .Release.Namespace }}
88
data:
99
{{- if .Values.global }}
10-
SAN_LIST: {{ .Values.global.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc.cluster.local
11-
AAS_TLS_SAN: {{ .Values.global.controlPlaneHostname }},{{.Values.dependentServices.aas}}.{{ .Release.Namespace }}.svc.cluster.local
10+
SAN_LIST: {{ .Values.global.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc
11+
AAS_TLS_SAN: {{ .Values.global.controlPlaneHostname }},{{.Values.dependentServices.aas}}.{{ .Release.Namespace }}.svc
1212
{{- else }}
13-
SAN_LIST: {{ .Values.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc.cluster.local
14-
AAS_TLS_SAN: {{ .Values.controlPlaneHostname }},{{.Values.dependentServices.aas}}.{{ .Release.Namespace }}.svc.cluster.local
13+
SAN_LIST: {{ .Values.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc
14+
AAS_TLS_SAN: {{ .Values.controlPlaneHostname }},{{.Values.dependentServices.aas}}.{{ .Release.Namespace }}.svc
1515
{{- end }}
16-
AAS_API_URL: https://{{.Values.dependentServices.aas}}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.aas.containerPort }}/aas/v1
16+
AAS_API_URL: https://{{.Values.dependentServices.aas}}.{{ .Release.Namespace }}.svc:{{ .Values.service.aas.containerPort }}/aas/v1
1717
---
1818
# templates/init-script-configmap.yaml
1919
apiVersion: v1

‎helm/attestation-verifier/charts/factory/templates/_init.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Wait for Database bootstrap
1111
args:
1212
- >
1313
i=0 &&
14-
while [ -z $(pg_isready -h {{ include "factory.name" . }}db.{{ .Release.Namespace }}.svc.cluster.local -p {{ .Values.config.dbPort }} -U {{ .Values.secret.dbUsername }} | grep "accepting connections") ] && [ $i -lt 5 ]; do sleep 2; i=$((i+1)); echo "Waiting for {{ include "factory.name" . }} db connection..."; done &&
14+
while [ -z $(pg_isready -h {{ include "factory.name" . }}db.{{ .Release.Namespace }}.svc -p {{ .Values.config.dbPort }} -U {{ .Values.secret.dbUsername }} | grep "accepting connections") ] && [ $i -lt 5 ]; do sleep 2; i=$((i+1)); echo "Waiting for {{ include "factory.name" . }} db connection..."; done &&
1515
if [ $i -eq 5 ]; then echo "Error: timeout exceeded for {{ include "factory.name" . }} db: wait-for-{{ include "factory.name" . }}db"; exit 1; fi
1616
{{- end }}
1717

‎helm/attestation-verifier/charts/factory/templates/_job.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
{{- end }}
4747
{{- end }}
4848
- name: URL
49-
value: https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.aas.containerPort }}/aas/v1/version
49+
value: https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc:{{ .Values.service.aas.containerPort }}/aas/v1/version
5050
- name: VERSION
5151
value: {{.Chart.AppVersion }}
5252
- name: DEPENDENT_SERVICE_NAME
@@ -147,7 +147,7 @@ spec:
147147
{{- end }}
148148
{{- end }}
149149
- name: URL
150-
value: https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.aas.containerPort }}/aas/v1/version
150+
value: https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc:{{ .Values.service.aas.containerPort }}/aas/v1/version
151151
- name: VERSION
152152
value: {{.Chart.AppVersion }}
153153
- name: DEPENDENT_SERVICE_NAME

‎helm/attestation-verifier/charts/global-admin-generator/aas-manager.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{- if .Values.aas.url }}
33
"aas_api_url": "{{ .Values.aas.url }}",
44
{{- else }}
5-
"aas_api_url": "https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.aas.containerPort }}/aas/v1",
5+
"aas_api_url": "https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc:{{ .Values.service.aas.containerPort }}/aas/v1",
66
{{- end }}
77
{{- if .Values.global }}
88
"aas_admin_username": "{{ required "A valid admin username is required!" .Values.global.aas.secret.adminUsername }}",

‎helm/attestation-verifier/charts/hvs/aas-manager.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{- if .Values.aas.url }}
33
"aas_api_url": "{{ .Values.aas.url }}",
44
{{- else }}
5-
"aas_api_url": "https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.aas.containerPort }}/aas/v1",
5+
"aas_api_url": "https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc:{{ .Values.service.aas.containerPort }}/aas/v1",
66
{{- end }}
77
{{- if .Values.global }}
88
"aas_admin_username": "{{ required "A valid admin username is required!" .Values.global.aas.secret.adminUsername }}",
@@ -21,9 +21,9 @@
2121
"service": "CMS",
2222
"name": "CertApprover",
2323
{{- if .Values.global }}
24-
"context":"CN=HVS TLS Certificate;SAN=hvs.{{ .Release.Namespace }}.svc.cluster.local,{{ .Values.global.controlPlaneHostname }};certType=TLS"
24+
"context":"CN=HVS TLS Certificate;SAN=hvs.{{ .Release.Namespace }}.svc,{{ .Values.global.controlPlaneHostname }};certType=TLS"
2525
{{- else }}
26-
"context":"CN=HVS TLS Certificate;SAN=hvs.{{ .Release.Namespace }}.svc.cluster.local,{{ .Values.controlPlaneHostname }};certType=TLS"
26+
"context":"CN=HVS TLS Certificate;SAN=hvs.{{ .Release.Namespace }}.svc,{{ .Values.controlPlaneHostname }};certType=TLS"
2727
{{- end }}
2828
},
2929
{

‎helm/attestation-verifier/charts/hvs/templates/configmap.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ metadata:
66
name: {{ include "factory.name" . }}
77
namespace: {{ .Release.Namespace }}
88
data:
9-
AAS_API_URL: https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.aas.containerPort }}/aas/v1
10-
CMS_BASE_URL: https://{{ .Values.dependentServices.cms }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.cms.containerPort }}/cms/v1
9+
AAS_API_URL: https://{{ .Values.dependentServices.aas }}.{{ .Release.Namespace }}.svc:{{ .Values.service.aas.containerPort }}/aas/v1
10+
CMS_BASE_URL: https://{{ .Values.dependentServices.cms }}.{{ .Release.Namespace }}.svc:{{ .Values.service.cms.containerPort }}/cms/v1
1111
{{- if .Values.global }}
12-
SAN_LIST: {{ .Values.global.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc.cluster.local
12+
SAN_LIST: {{ .Values.global.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc
1313
{{- else }}
14-
SAN_LIST: {{ .Values.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc.cluster.local
14+
SAN_LIST: {{ .Values.controlPlaneHostname }},{{ include "factory.name" . }}.{{ .Release.Namespace }}.svc
1515
{{- end }}
16-
HVS_DB_HOSTNAME: {{ include "factory.name" . }}db.{{ .Release.Namespace }}.svc.cluster.local
16+
HVS_DB_HOSTNAME: {{ include "factory.name" . }}db.{{ .Release.Namespace }}.svc
1717
HVS_DB_NAME: {{ .Values.config.dbName }}
1818
HVS_DB_SSLCERT: {{ .Values.config.dbSSLCert }}
1919
HVS_DB_PORT: {{ .Values.config.dbPort | quote }}
@@ -22,8 +22,8 @@ data:
2222
VERIFY_QUOTE_FOR_HOST_REGISTRATION: "{{ .Values.config.verifyQuoteForHostRegistration }}"
2323
{{- if .Values.global }}
2424
{{- if .Values.global.config.nats.enabled }}
25-
NATS_SERVERS: nats://nats.{{ .Release.Namespace }}.svc.cluster.local:4222
25+
NATS_SERVERS: nats://nats.{{ .Release.Namespace }}.svc:4222
2626
{{- end }}
2727
{{- else if .Values.config.nats.enabled }}
28-
NATS_SERVERS: nats://nats.{{ .Release.Namespace }}.svc.cluster.local:4222
28+
NATS_SERVERS: nats://nats.{{ .Release.Namespace }}.svc:4222
2929
{{- end }}

0 commit comments

Comments
 (0)