Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(daps): remove daps configuration #59

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions charts/portal/templates/deployment-backend-administration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,27 +187,6 @@ spec:
value: "{{ .Values.backend.administration.connectors.validCertificationContentTypes.type3 }}"
- name: "CONNECTORS__SELFDESCRIPTIONDOCUMENTURL"
value: "{{ .Values.portalBackendAddress }}{{ .Values.backend.administration.connectors.selfDescriptionDocumentPath }}"
- name: "DAPS__CLIENTID"
value: "{{ .Values.backend.administration.daps.clientId }}"
- name: "DAPS__ISACTIVE"
value: "{{ .Values.backend.administration.daps.isActive }}"
- name: "DAPS__CLIENTSECRET"
valueFrom:
secretKeyRef:
name: "{{ .Values.backend.interfaces.secret }}"
key: "daps-client-secret"
- name: "DAPS__DAPSURL"
value: "{{ .Values.dapsAddress }}{{ .Values.backend.administration.daps.apiPath }}"
- name: "DAPS__GRANTTYPE"
value: "{{ .Values.backend.administration.daps.grantType }}"
- name: "DAPS__KEYCLOAKTOKENADDRESS"
value: "{{ .Values.centralidpAddress }}{{ .Values.backend.keycloak.central.tokenPath }}"
- name: "DAPS__PASSWORD"
value: "{{ .Values.backend.placeholder }}"
- name: "DAPS__SCOPE"
value: "{{ .Values.backend.administration.daps.scope }}"
- name: "DAPS__USERNAME"
value: "{{ .Values.backend.placeholder }}"
- name: "Document__EnableSeedEndpoint"
value: "True"
- name: "Document__FRAMEDOCUMENTTYPEIDS__0"
Expand Down
2 changes: 0 additions & 2 deletions charts/portal/templates/secret-backend-interfaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ data:
clearinghouse-client-secret: {{ coalesce ( .Values.backend.processesworker.clearinghouse.clientSecret | b64enc ) ( index $secret.data "clearinghouse-client-secret" ) | default ( randAlphaNum 32 | quote ) }}
custodian-client-secret: {{ coalesce ( .Values.backend.processesworker.custodian.clientSecret | b64enc ) ( index $secret.data "custodian-client-secret" ) | default ( randAlphaNum 32 | quote ) }}
sdfactory-client-secret: {{ coalesce ( .Values.backend.processesworker.sdfactory.clientSecret | b64enc ) ( index $secret.data "sdfactory-client-secret" ) | default ( randAlphaNum 32 | quote ) }}
daps-client-secret: {{ coalesce ( .Values.backend.administration.daps.clientSecret | b64enc ) ( index $secret.data "daps-client-secret" ) | default ( randAlphaNum 32 | quote ) }}
offerprovider-client-secret: {{ coalesce ( .Values.backend.processesworker.offerprovider.clientSecret | b64enc ) ( index $secret.data "offerprovider-client-secret" ) | default ( randAlphaNum 32 | quote ) }}
{{ else -}}
stringData:
Expand All @@ -43,6 +42,5 @@ stringData:
clearinghouse-client-secret: {{ .Values.backend.processesworker.clearinghouse.clientSecret | default ( randAlphaNum 32 | quote ) }}
custodian-client-secret: {{ .Values.backend.processesworker.custodian.clientSecret | default ( randAlphaNum 32 | quote ) }}
sdfactory-client-secret: {{ .Values.backend.processesworker.sdfactory.clientSecret | default ( randAlphaNum 32 | quote ) }}
daps-client-secret: {{ .Values.backend.administration.daps.clientSecret | default ( randAlphaNum 32 | quote ) }}
offerprovider-client-secret: {{ .Values.backend.processesworker.offerprovider.clientSecret | default ( randAlphaNum 32 | quote ) }}
{{ end }}
14 changes: 1 addition & 13 deletions charts/portal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ sharedidpAddress: "https://sharedidp.example.org"
# -- Provide semantics base address.
semanticsAddress: "https://semantics.example.org"

# -- Provide daps base address
dapsAddress: "https://daps.example.org"

# -- Provide bpdm partners pool base address.
bpdmPartnersPoolAddress: "https://business-partners.example.org"

Expand Down Expand Up @@ -242,7 +239,7 @@ backend:
# -- Password for the smtp username. Secret-key 'password'.
password: ""
interfaces:
# -- Secret containing the client-secrets for the connection to daps, custodian, bpdm, sdFactory, clearinghouse and offer provider.
# -- Secret containing the client-secrets for the connection to custodian, bpdm, sdFactory, clearinghouse and offer provider.
secret: "secret-backend-interfaces"
healthChecks:
startup:
Expand Down Expand Up @@ -333,15 +330,6 @@ backend:
type3: "application/octet-stream"
selfDescriptionDocumentPath: /api/administration/documents/selfDescription
keycloakClientId: "Cl2-CX-Portal"
daps:
apiPath: "/api/v1/daps/"
scope: "openid"
grantType: "client_credentials"
# -- Provide daps client-id from CX IAM centralidp.
clientId: "daps-client-id"
# -- Client-secret for daps client-id. Secret-key 'daps-client-secret'.
clientSecret: ""
isActive: "false"
identityProviderAdmin:
csvSettings:
fileName: "identityproviderlinks.csv"
Expand Down
4 changes: 0 additions & 4 deletions consortia/environments/values-beta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ portalBackendAddress: "https://portal-backend.beta.demo.catena-x.net"
centralidpAddress: "https://centralidp.beta.demo.catena-x.net"
sharedidpAddress: "https://sharedidp.beta.demo.catena-x.net"
semanticsAddress: "https://semantics.beta.demo.catena-x.net"
dapsAddress: "https://drs.beta.demo.catena-x.net"
bpdmPartnersPoolAddress: "https://business-partners.beta.demo.catena-x.net"
bpdmPortalGateAddress: "https://business-partners.beta.demo.catena-x.net"
custodianAddress: "https://managed-identity-wallets-new.beta.demo.catena-x.net"
Expand Down Expand Up @@ -146,9 +145,6 @@ backend:
value: "portaldb"
- name: "HEALTHCHECKS__0__TAGS__2"
value: "provisioningdb"
daps:
clientId: "<path:portal/data/administration#daps-client-id>"
clientSecret: "<path:portal/data/beta/administration#daps-client-secret>"
swaggerEnabled: true

provisioning:
Expand Down
4 changes: 0 additions & 4 deletions consortia/environments/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ portalBackendAddress: "https://portal-backend.dev.demo.catena-x.net"
centralidpAddress: "https://centralidp.dev.demo.catena-x.net"
sharedidpAddress: "https://sharedidp.dev.demo.catena-x.net"
semanticsAddress: "https://semantics.dev.demo.catena-x.net"
dapsAddress: "https://drs.dev.demo.catena-x.net"
bpdmPartnersPoolAddress: "https://business-partners.dev.demo.catena-x.net"
bpdmPortalGateAddress: "https://business-partners.dev.demo.catena-x.net"
custodianAddress: "https://managed-identity-wallets-new.dev.demo.catena-x.net"
Expand Down Expand Up @@ -146,9 +145,6 @@ backend:
value: "portaldb"
- name: "HEALTHCHECKS__0__TAGS__2"
value: "provisioningdb"
daps:
clientId: "<path:portal/data/administration#daps-client-id>"
clientSecret: "<path:portal/data/dev/administration#daps-client-secret>"
swaggerEnabled: true

provisioning:
Expand Down
4 changes: 0 additions & 4 deletions consortia/environments/values-int.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ portalBackendAddress: "https://portal-backend.int.demo.catena-x.net"
centralidpAddress: "https://centralidp.int.demo.catena-x.net"
sharedidpAddress: "https://sharedidp.int.demo.catena-x.net"
semanticsAddress: "https://semantics.int.demo.catena-x.net"
dapsAddress: "https://drs.int.demo.catena-x.net"
bpdmPartnersPoolAddress: "https://business-partners.int.demo.catena-x.net"
bpdmPortalGateAddress: "https://business-partners.int.demo.catena-x.net"
custodianAddress: "https://managed-identity-wallets-new.int.demo.catena-x.net"
Expand Down Expand Up @@ -146,9 +145,6 @@ backend:
value: "portaldb"
- name: "HEALTHCHECKS__0__TAGS__2"
value: "provisioningdb"
daps:
clientId: "<path:portal/data/administration#daps-client-id>"
clientSecret: "<path:portal/data/int/administration#daps-client-secret>"
swaggerEnabled: true

provisioning:
Expand Down
4 changes: 0 additions & 4 deletions consortia/environments/values-pen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ portalBackendAddress: "https://portal-backend-pen.dev.demo.catena-x.net"
centralidpAddress: "https://centralidp-pen.dev.demo.catena-x.net"
sharedidpAddress: "https://sharedidp-pen.dev.demo.catena-x.net"
semanticsAddress: "https://semantics-pen.dev.demo.catena-x.net"
dapsAddress: "https://drs-pen.int.demo.catena-x.net"
bpdmPartnersPoolAddress: "https://business-partners-pen.dev.demo.catena-x.net"
bpdmPortalGateAddress: "https://business-partners-pen.dev.demo.catena-x.net"
custodianAddress: "https://managed-identity-wallets-pen-new.dev.demo.catena-x.net"
Expand Down Expand Up @@ -147,9 +146,6 @@ backend:
value: "portaldb"
- name: "HEALTHCHECKS__0__TAGS__2"
value: "provisioningdb"
daps:
clientId: "<path:portal/data/administration#daps-client-id>"
clientSecret: "<path:portal/data/pen/administration#daps-client-secret>"
swaggerEnabled: true

provisioning:
Expand Down
4 changes: 0 additions & 4 deletions consortia/environments/values-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ portalBackendAddress: "https://portal-backend-rc.dev.demo.catena-x.net"
centralidpAddress: "https://centralidp-rc.dev.demo.catena-x.net"
sharedidpAddress: "https://sharedidp-rc.dev.demo.catena-x.net"
semanticsAddress: "https://semantics.dev.demo.catena-x.net"
dapsAddress: "https://drs.dev.demo.catena-x.net"
bpdmPartnersPoolAddress: "https://business-partners.dev.demo.catena-x.net"
bpdmPortalGateAddress: "https://business-partners.dev.demo.catena-x.net"
custodianAddress: "https://managed-identity-wallets-new.dev.demo.catena-x.net"
Expand Down Expand Up @@ -146,9 +145,6 @@ backend:
value: "portaldb"
- name: "HEALTHCHECKS__0__TAGS__2"
value: "provisioningdb"
daps:
clientId: "<path:portal/data/administration#daps-client-id>"
clientSecret: "<path:portal/data/dev/administration#daps-client-secret>"
swaggerEnabled: true

provisioning:
Expand Down
4 changes: 0 additions & 4 deletions consortia/environments/values-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ portalBackendAddress: "https://portal-backend.stable.demo.catena-x.net"
centralidpAddress: "https://centralidp.stable.demo.catena-x.net"
sharedidpAddress: "https://sharedidp.stable.demo.catena-x.net"
semanticsAddress: "https://semantics.stable.demo.catena-x.net"
dapsAddress: "https://drs.stable.demo.catena-x.net"
bpdmPartnersPoolAddress: "https://business-partners.stable.demo.catena-x.net"
bpdmPortalGateAddress: "https://business-partners.stable.demo.catena-x.net"
custodianAddress: "https://managed-identity-wallets-new.stable.demo.catena-x.net"
Expand Down Expand Up @@ -146,9 +145,6 @@ backend:
value: "portaldb"
- name: "HEALTHCHECKS__0__TAGS__2"
value: "provisioningdb"
daps:
clientId: "<path:portal/data/administration#daps-client-id>"
clientSecret: "<path:portal/data/stable/administration#daps-client-secret>"
swaggerEnabled: true

provisioning:
Expand Down