From 654b7dc3460539fcff6a32bc3e87c1e8767d5866 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 27 Sep 2023 11:13:07 -0400 Subject: [PATCH] Make the helm deploy the default --- deploy/marlowe-playground.yaml | 186 ------------------------- helm/templates/marlowe-playground.yaml | 20 +-- 2 files changed, 10 insertions(+), 196 deletions(-) delete mode 100644 deploy/marlowe-playground.yaml diff --git a/deploy/marlowe-playground.yaml b/deploy/marlowe-playground.yaml deleted file mode 100644 index 5a836d1e9..000000000 --- a/deploy/marlowe-playground.yaml +++ /dev/null @@ -1,186 +0,0 @@ -apiVersion: core.oam.dev/v1beta1 -kind: Application -metadata: - name: marlowe-playground - namespace: marlowe-staging - annotations: - app.oam.dev/publishVersion: 0.0.4 -spec: - components: - - name: marlowe-playground - type: webservice - properties: - cpu: "0.5" - image: ghcr.io/input-output-hk/marlowe-playground-server:61627e5e - args: - - webserver - env: - - name: FRONTEND_URL - value: https://marlowe-playground.scdev.aws.iohkdev.io - - name: WEBGHC_URL - value: http://localhost:8080 - - name: JWT_SIGNATURE - valueFrom: - secretKeyRef: - key: JWT_SIGNATURE - name: jwt-signature - - name: GITHUB_CLIENT_ID - valueFrom: - secretKeyRef: - key: clientID - name: gh-oauth - - name: GITHUB_CLIENT_SECRET - valueFrom: - secretKeyRef: - key: clientSecret - name: gh-oauth - - name: GITHUB_CALLBACK_PATH - valueFrom: - secretKeyRef: - key: callbackPath - name: gh-oauth - imagePullPolicy: Always - memory: 1024Mi - ports: - - expose: true - port: 8080 - protocol: TCP - traits: - - properties: - replicas: 1 - type: scaler - - properties: - domains: - - marlowe-playground.scdev.aws.iohkdev.io - rules: - - path: - type: PathPrefix - value: /api - port: 8080 - type: https-route - - name: marlowe-playground-client - type: webservice - properties: - cpu: "0.5" - image: p3terx/darkhttpd - args: - - /client-www - - --port - - "8080" - imagePullPolicy: Always - memory: 1024Mi - ports: - - expose: true - port: 8080 - protocol: TCP - traits: - - properties: - replicas: 1 - type: scaler - - properties: - domains: - - marlowe-playground.scdev.aws.iohkdev.io - rules: - - port: 8080 - type: https-route - - type: init-container - properties: - name: playground-client - image: ghcr.io/input-output-hk/marlowe-playground-client:61627e5e - mountName: client-www - initMountPath: /share/marlowe-playground-client/static - appMountPath: /client-www - - policies: - - name: local-marlowe-staging - properties: - clusters: - - local - namespace: marlowe-staging - type: topology - - - name: local-marlowe-production - properties: - clusters: - - local - namespace: marlowe-production - type: topology - - - name: override-marlowe-production - type: override - properties: - components: - - name: marlowe-playground - properties: - env: - - name: FRONTEND_URL - value: https://play.marlowe.iohk.io - - name: WEBGHC_URL - value: http://localhost:8080 - - name: JWT_SIGNATURE - valueFrom: - secretKeyRef: - key: JWT_SIGNATURE - name: jwt-signature - - name: GITHUB_CLIENT_ID - valueFrom: - secretKeyRef: - key: clientID - name: gh-oauth-production - - name: GITHUB_CLIENT_SECRET - valueFrom: - secretKeyRef: - key: clientSecret - name: gh-oauth-production - - name: GITHUB_CALLBACK_PATH - valueFrom: - secretKeyRef: - key: callbackPath - name: gh-oauth-production - image: ghcr.io/input-output-hk/marlowe-playground-server:61627e5e - traits: - - properties: - domains: - - play.marlowe.iohk.io - rules: - - path: - type: PathPrefix - value: /api - port: 8080 - type: https-route - - name: marlowe-playground-client - properties: - image: p3terx/darkhttpd - traits: - - properties: - domains: - - play.marlowe.iohk.io - rules: - - port: 8080 - type: https-route - - type: init-container - properties: - name: build-client - image: ghcr.io/input-output-hk/marlowe-playground-client:61627e5e - mountName: client-www - initMountPath: /share/marlowe-playground-client/static - appMountPath: /client-www - workflow: - mode: - steps: DAG - steps: - - meta: - alias: Deploy To local-marlowe-staging - name: local-marlowe-staging - properties: - policies: - - local-marlowe-staging - type: deploy - - meta: - alias: Deploy To local-marlowe-production - name: local-marlowe-production - properties: - policies: - - local-marlowe-production - - override-marlowe-production - type: deploy diff --git a/helm/templates/marlowe-playground.yaml b/helm/templates/marlowe-playground.yaml index e9fe5550c..e6e09a9c0 100644 --- a/helm/templates/marlowe-playground.yaml +++ b/helm/templates/marlowe-playground.yaml @@ -1,11 +1,11 @@ apiVersion: core.oam.dev/v1beta1 kind: Application metadata: - name: marlowe-playground-test + name: marlowe-playground namespace: marlowe-staging spec: components: - - name: marlowe-playground-test + - name: marlowe-playground type: webservice properties: cpu: "0.5" @@ -14,7 +14,7 @@ spec: - webserver env: - name: FRONTEND_URL - value: https://marlowe-playground-test.scdev.aws.iohkdev.io + value: https://marlowe-playground.scdev.aws.iohkdev.io - name: WEBGHC_URL value: http://localhost:8080 - name: JWT_SIGNATURE @@ -49,14 +49,14 @@ spec: type: scaler - properties: domains: - - marlowe-playground-test.scdev.aws.iohkdev.io + - marlowe-playground.scdev.aws.iohkdev.io rules: - path: type: PathPrefix value: /api port: 8080 type: https-route - - name: marlowe-playground-client-test + - name: marlowe-playground-client type: webservice properties: cpu: "0.5" @@ -77,7 +77,7 @@ spec: type: scaler - properties: domains: - - marlowe-playground-test.scdev.aws.iohkdev.io + - marlowe-playground.scdev.aws.iohkdev.io rules: - port: 8080 type: https-route @@ -117,7 +117,7 @@ spec: properties: env: - name: FRONTEND_URL - value: https://playtest.marlowe.iohk.io + value: https://play.marlowe.iohk.io - name: WEBGHC_URL value: http://localhost:8080 - name: JWT_SIGNATURE @@ -144,20 +144,20 @@ spec: traits: - properties: domains: - - playtest.marlowe.iohk.io + - play.marlowe.iohk.io rules: - path: type: PathPrefix value: /api port: 8080 type: https-route - - name: marlowe-playground-client-test + - name: marlowe-playground-client properties: image: p3terx/darkhttpd traits: - properties: domains: - - playtest.marlowe.iohk.io + - play.marlowe.iohk.io rules: - port: 8080 type: https-route