diff --git a/infrastructure-values.yaml b/infrastructure-values.yaml index ef49a64..e1c9f8f 100644 --- a/infrastructure-values.yaml +++ b/infrastructure-values.yaml @@ -6,3 +6,5 @@ apicurio: uiHostname: "apicurio-demo-apimgmt.apps.appdev.itix.xyz" apiHostname: "apicurio-api-demo-apimgmt.apps.appdev.itix.xyz" wsHostname: "apicurio-ws-demo-apimgmt.apps.appdev.itix.xyz" +threescale: + wildcardDomain: apps.appdev.itix.xyz diff --git a/infrastructure/templates/3scale.yaml b/infrastructure/templates/3scale.yaml index 03ccda4..c8dc380 100644 --- a/infrastructure/templates/3scale.yaml +++ b/infrastructure/templates/3scale.yaml @@ -11,3 +11,12 @@ spec: source: redhat-operators sourceNamespace: openshift-marketplace --- +apiVersion: apps.3scale.net/v1alpha1 +kind: APIManager +metadata: + name: 3scale-install + namespace: 3scale +spec: + productVersion: "2.12" + wildcardDomain: {{ .Values.threescale.wildcardDomain | quote }} + resourceRequirementsEnabled: true diff --git a/infrastructure/templates/apicurio.yaml b/infrastructure/templates/apicurio.yaml index 8780b80..f75fa77 100644 --- a/infrastructure/templates/apicurio.yaml +++ b/infrastructure/templates/apicurio.yaml @@ -119,6 +119,15 @@ spec: value: 512m - name: APICURIO_MAX_HEAP value: 1400m + - name: APICURIO_MICROCKS_API_URL + value: {{ (printf "https://%s/api" .Values.microcks.hostname) | quote }} + - name: APICURIO_MICROCKS_CLIENT_ID + value: microcks-serviceaccount + - name: APICURIO_MICROCKS_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: microcks-client-secret + name: demo-seed image: apicurio/apicurio-studio-api:latest-release imagePullPolicy: Always livenessProbe: @@ -278,6 +287,8 @@ spec: value: 512m - name: APICURIO_MAX_HEAP value: 1200m + - name: APICURIO_UI_FEATURE_MICROCKS + value: "true" image: apicurio/apicurio-studio-ui:latest-release imagePullPolicy: Always livenessProbe: diff --git a/infrastructure/templates/project.yaml b/infrastructure/templates/project.yaml index 633b12a..7d3b267 100644 --- a/infrastructure/templates/project.yaml +++ b/infrastructure/templates/project.yaml @@ -33,3 +33,4 @@ data: sso-admin-password: {{ trunc 16 (sha256sum (cat .Values.masterKey "sso-admin-password")) | b64enc | quote }} sso-database-password: {{ trunc 16 (sha256sum (cat .Values.masterKey "sso-database-password")) | b64enc | quote }} apicurio-database-password: {{ trunc 16 (sha256sum (cat .Values.masterKey "sso-apicurio-password")) | b64enc | quote }} + microcks-client-secret: {{ trunc 16 (sha256sum (cat .Values.masterKey "microcks-client-secret")) | b64enc | quote }} diff --git a/infrastructure/values.yaml b/infrastructure/values.yaml index 173a3e6..24efbcd 100644 --- a/infrastructure/values.yaml +++ b/infrastructure/values.yaml @@ -1,3 +1,5 @@ sso: hostname: "" projectName: demo-apimgmt +threescale: + wildcardDomain: ""