[LW-8192] chore: adjust E2E for macOS (`conway-era`) #1206

michalrus · 2024-04-10T17:11:54Z

Context

A continuation of #1172, this time tweaking the local-network container (and a few other things to make it work on macOS).

This PR is for conway-era, a master one is #1205.

Again, underlying changes are in the ogmios-tracker repository.

321336460-db83374f-3cc9-4b9e-a7e1-557e162f6e55

Testing

See #1205.

Proposed Solution

See #1205.

Important Changes Introduced

See #1205.

michalrus · 2024-04-12T11:32:44Z

The diff was simplified thanks to #1210

mirceahasegan

awesome simple change 🚀

LW-8192

github-actions · 2024-04-12T12:52:17Z

dev-sanchonet@us-east-1@v1 would change:

dev-sanchonet, dev-sanchonet-cardanojs-v1-backend, Deployment (apps) would change:

  # Source: cardanojs/templates/backend-deployment.yaml
  apiVersion: apps/v1
  kind: Deployment
  metadata:
    labels:
      app: backend
      network: sanchonet
      release: dev-sanchonet-cardanojs-v1
    name: dev-sanchonet-cardanojs-v1-backend
  spec:
    selector:
      matchLabels:
        app: backend
        network: sanchonet
        release: dev-sanchonet-cardanojs-v1
    template:
      metadata:
        labels:
          app: backend
          network: sanchonet
          release: dev-sanchonet-cardanojs-v1
      spec:
        containers:
        - args:
          - start-provider-server
          env:
          - name: ALLOWED_ORIGINS
            value: chrome-extension://gafhhkghbfjjkeiendhlofajokpaflmk,chrome-extension://efeiemlfnahiidnjglmehaihacglceia,chrome-extension://bjlhpephaokolembmpdcbobbpkjnoheb,chrome-extension://djcdfchkaijggdjokfomholkalbffgil,http://localhost/,http://localhost
          - name: BUILD_INFO
-           value: '{"extra":{"narHash":"sha256-4eKqhVj1+NB7pYn52O64zjL1zX4i2JvPPzjV4VqCnBg=","path":"/nix/store/7vx7flb9hsyi9qxajvs75pgax71xf1cv-source","sourceInfo":"/nix/store/7vx7flb9hsyi9qxajvs75pgax71xf1cv-source"},"lastModified":1712925538,"lastModifiedDate":"20240412123858","rev":"7cbfeed1a2ae13da8377d576049c4b007cabcac4","shortRev":"7cbfeed"}'
+           value: '{"extra":{"narHash":"sha256-KVSS8MSr73evsuY1uiYW6kn7d9UXbocojr9/8ca6Eqk=","path":"/nix/store/6lsvazpzwgh7hr7pmzyq64zmih8dmhxz-source","sourceInfo":"/nix/store/6lsvazpzwgh7hr7pmzyq64zmih8dmhxz-source"},"lastModified":1712925682,"lastModifiedDate":"20240412124122","rev":"8ab8addd2eb4b696070bca3f128a836e424f3e81","shortRev":"8ab8add"}'
          - name: DISABLE_STAKE_POOL_METRIC_APY
            value: "true"
          - name: ENABLE_METRICS
            value: "true"
          - name: HANDLE_POLICY_IDS
            value: f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a
          - name: HANDLE_PROVIDER_SERVER_URL
            value: https://sanchonet.api.handle.me
          - name: LOGGER_MIN_SEVERITY
            value: debug
          - name: NETWORK
            value: sanchonet
          - name: OGMIOS_SRV_SERVICE_NAME
            value: dev-sanchonet-cardano-core.dev-sanchonet.svc.cluster.local
          - name: PAGINATION_PAGE_SIZE_LIMIT
            value: "5500"
          - name: POSTGRES_DB_DB_SYNC
            value: cardano
          - name: POSTGRES_DB_HANDLE
            value: handle
          - name: POSTGRES_HOST_DB_SYNC
            value: dev-sanchonet-postgresql
          - name: POSTGRES_HOST_HANDLE
            value: dev-sanchonet-postgresql
          - name: POSTGRES_PASSWORD_DB_SYNC
            valueFrom:
              secretKeyRef:
                key: password
                name: cardano-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: POSTGRES_PASSWORD_HANDLE
            valueFrom:
              secretKeyRef:
                key: password
                name: handle-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: POSTGRES_POOL_MAX_DB_SYNC
            value: "50"
          - name: POSTGRES_POOL_MAX_HANDLE
            value: "10"
          - name: POSTGRES_PORT_DB_SYNC
            value: "5432"
          - name: POSTGRES_PORT_HANDLE
            value: "5432"
          - name: POSTGRES_SSL_CA_FILE_DB_SYNC
            value: /tls/ca.crt
          - name: POSTGRES_SSL_CA_FILE_HANDLE
            value: /tls/ca.crt
          - name: POSTGRES_SSL_DB_SYNC
            value: "true"
          - name: POSTGRES_SSL_HANDLE
            value: "true"
          - name: POSTGRES_USER_DB_SYNC
            valueFrom:
              secretKeyRef:
                key: username
                name: cardano-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: POSTGRES_USER_HANDLE
            valueFrom:
              secretKeyRef:
                key: username
                name: handle-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: SERVICE_NAMES
            value: asset,chain-history,network-info,rewards,stake-pool,tx-submit,utxo
          - name: SUBMIT_API_URL
            value: http://dev-sanchonet-cardano-stack.dev-sanchonet.svc.cluster.local:8090
          - name: TOKEN_METADATA_SERVER_URL
            value: http://dev-sanchonet-cardano-stack-metadata.dev-sanchonet.svc.cluster.local
          - name: USE_BLOCKFROST
            value: "false"
          - name: USE_KORA_LABS
            value: "true"
          - name: USE_SUBMIT_API
            value: "true"
-         image: 926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:p03nzavf2r87kzr5gkkhq8m469n4h8lk
+         image: 926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:mb2pjfywr0fz845wkk82ix082271l2ga
          livenessProbe:
            httpGet:
              path: /v1.0.0/health
              port: 3000
            timeoutSeconds: 5
          name: backend
          ports:
          - containerPort: 3000
            name: http
          resources:
            limits:
              cpu: 1500m
              memory: 512Mi
            requests:
              cpu: 1000m
              memory: 350Mi
          securityContext:
            runAsGroup: 0
            runAsUser: 0
          volumeMounts:
          - mountPath: /tls
            name: tls
        imagePullSecrets:
        - name: dockerconfigjson
        volumes:
        - name: tls
          secret:
            secretName: postgresql-server-cert

dev-sanchonet, dev-sanchonet-cardanojs-v1-pg-boss-worker, Deployment (apps) would change:

  # Source: cardanojs/templates/pgboss-deployment.yaml
  apiVersion: apps/v1
  kind: Deployment
  metadata:
    labels:
      app: pg-boss-worker
      network: sanchonet
      release: dev-sanchonet-cardanojs-v1
    name: dev-sanchonet-cardanojs-v1-pg-boss-worker
  spec:
    selector:
      matchLabels:
        app: pg-boss-worker
        network: sanchonet
        release: dev-sanchonet-cardanojs-v1
    template:
      metadata:
        labels:
          app: pg-boss-worker
          network: sanchonet
          release: dev-sanchonet-cardanojs-v1
      spec:
        containers:
        - args:
          - start-pg-boss-worker
          env:
          - name: BUILD_INFO
-           value: '{"extra":{"narHash":"sha256-4eKqhVj1+NB7pYn52O64zjL1zX4i2JvPPzjV4VqCnBg=","path":"/nix/store/7vx7flb9hsyi9qxajvs75pgax71xf1cv-source","sourceInfo":"/nix/store/7vx7flb9hsyi9qxajvs75pgax71xf1cv-source"},"lastModified":1712925538,"lastModifiedDate":"20240412123858","rev":"7cbfeed1a2ae13da8377d576049c4b007cabcac4","shortRev":"7cbfeed"}'
+           value: '{"extra":{"narHash":"sha256-KVSS8MSr73evsuY1uiYW6kn7d9UXbocojr9/8ca6Eqk=","path":"/nix/store/6lsvazpzwgh7hr7pmzyq64zmih8dmhxz-source","sourceInfo":"/nix/store/6lsvazpzwgh7hr7pmzyq64zmih8dmhxz-source"},"lastModified":1712925682,"lastModifiedDate":"20240412124122","rev":"8ab8addd2eb4b696070bca3f128a836e424f3e81","shortRev":"8ab8add"}'
          - name: LOGGER_MIN_SEVERITY
            value: debug
          - name: METADATA_FETCH_MODE
            value: smash
          - name: NETWORK
            value: sanchonet
          - name: POSTGRES_DB_DB_SYNC
            value: cardano
          - name: POSTGRES_DB_STAKE_POOL
            value: stakepool
          - name: POSTGRES_HOST_DB_SYNC
            value: dev-sanchonet-postgresql
          - name: POSTGRES_HOST_STAKE_POOL
            value: dev-sanchonet-postgresql
          - name: POSTGRES_PASSWORD_DB_SYNC
            valueFrom:
              secretKeyRef:
                key: password
                name: cardano-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: POSTGRES_PASSWORD_STAKE_POOL
            valueFrom:
              secretKeyRef:
                key: password
                name: stakepool-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: POSTGRES_POOL_MAX_DB_SYNC
            value: "5"
          - name: POSTGRES_POOL_MAX_STAKE_POOL
            value: "5"
          - name: POSTGRES_PORT_DB_SYNC
            value: "5432"
          - name: POSTGRES_PORT_STAKE_POOL
            value: "5432"
          - name: POSTGRES_SSL_CA_FILE_DB_SYNC
            value: /tls/ca.crt
          - name: POSTGRES_SSL_CA_FILE_STAKE_POOL
            value: /tls/ca.crt
          - name: POSTGRES_SSL_DB_SYNC
            value: "true"
          - name: POSTGRES_SSL_STAKE_POOL
            value: "true"
          - name: POSTGRES_USER_DB_SYNC
            valueFrom:
              secretKeyRef:
                key: username
                name: cardano-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: POSTGRES_USER_STAKE_POOL
            valueFrom:
              secretKeyRef:
                key: username
                name: stakepool-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: QUEUES
            value: pool-metadata,pool-metrics
          - name: SMASH_URL
            value: https://sanchonet-smash.world.dev.cardano.org/api/v1
          - name: STAKE_POOL_PROVIDER_URL
            value: http://dev-sanchonet-cardanojs-v1-backend.dev-sanchonet.svc.cluster.local
-         image: 926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:p03nzavf2r87kzr5gkkhq8m469n4h8lk
+         image: 926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:mb2pjfywr0fz845wkk82ix082271l2ga
          livenessProbe:
            httpGet:
              path: /v1.0.0/health
              port: 3000
          name: pg-boss-worker
          ports:
          - containerPort: 3000
            name: http
          resources:
            limits:
              cpu: 300m
              memory: 300Mi
            requests:
              cpu: 200m
              memory: 150Mi
          securityContext:
            runAsGroup: 0
            runAsUser: 0
          startupProbe:
            httpGet:
              path: /v1.0.0/ready
              port: 3000
            initialDelaySeconds: 80
            periodSeconds: 5
          volumeMounts:
          - mountPath: /tls
            name: tls
        imagePullSecrets:
        - name: dockerconfigjson
        volumes:
        - name: tls
          secret:
            secretName: postgresql-server-cert

dev-sanchonet, dev-sanchonet-cardanojs-v1-stake-pool-projector, Deployment (apps) would change:

  # Source: cardanojs/templates/stake-pool-projector-deployment.yaml
  apiVersion: apps/v1
  kind: Deployment
  metadata:
    labels:
      app: stake-pool-projector
      network: sanchonet
      release: dev-sanchonet-cardanojs-v1
    name: dev-sanchonet-cardanojs-v1-stake-pool-projector
  spec:
    selector:
      matchLabels:
        app: stake-pool-projector
        network: sanchonet
        release: dev-sanchonet-cardanojs-v1
    template:
      metadata:
        labels:
          app: stake-pool-projector
          network: sanchonet
          release: dev-sanchonet-cardanojs-v1
      spec:
        containers:
        - args:
          - start-projector
          env:
          - name: BUILD_INFO
-           value: '{"extra":{"narHash":"sha256-4eKqhVj1+NB7pYn52O64zjL1zX4i2JvPPzjV4VqCnBg=","path":"/nix/store/7vx7flb9hsyi9qxajvs75pgax71xf1cv-source","sourceInfo":"/nix/store/7vx7flb9hsyi9qxajvs75pgax71xf1cv-source"},"lastModified":1712925538,"lastModifiedDate":"20240412123858","rev":"7cbfeed1a2ae13da8377d576049c4b007cabcac4","shortRev":"7cbfeed"}'
+           value: '{"extra":{"narHash":"sha256-KVSS8MSr73evsuY1uiYW6kn7d9UXbocojr9/8ca6Eqk=","path":"/nix/store/6lsvazpzwgh7hr7pmzyq64zmih8dmhxz-source","sourceInfo":"/nix/store/6lsvazpzwgh7hr7pmzyq64zmih8dmhxz-source"},"lastModified":1712925682,"lastModifiedDate":"20240412124122","rev":"8ab8addd2eb4b696070bca3f128a836e424f3e81","shortRev":"8ab8add"}'
          - name: LOGGER_MIN_SEVERITY
            value: debug
          - name: NETWORK
            value: sanchonet
          - name: OGMIOS_SRV_SERVICE_NAME
            value: dev-sanchonet-cardano-core.dev-sanchonet.svc.cluster.local
          - name: POSTGRES_DB
            value: stakepool
          - name: POSTGRES_HOST
            value: dev-sanchonet-postgresql
          - name: POSTGRES_PASSWORD
            valueFrom:
              secretKeyRef:
                key: password
                name: stakepool-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: POSTGRES_POOL_MAX
            value: "2"
          - name: POSTGRES_PORT
            value: "5432"
          - name: POSTGRES_SSL
            value: "true"
          - name: POSTGRES_SSL_CA_FILE
            value: /tls/ca.crt
          - name: POSTGRES_USER
            valueFrom:
              secretKeyRef:
                key: username
                name: stakepool-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: PROJECTION_NAMES
            value: stake-pool,stake-pool-metadata-job,stake-pool-metrics-job
-         image: 926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:p03nzavf2r87kzr5gkkhq8m469n4h8lk
+         image: 926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:mb2pjfywr0fz845wkk82ix082271l2ga
          livenessProbe:
            httpGet:
              path: /v1.0.0/health
              port: 3000
            timeoutSeconds: 5
          name: stake-pool-projector
          ports:
          - containerPort: 3000
            name: http
          resources:
            limits:
              cpu: 700m
              memory: 300Mi
            requests:
              cpu: 700m
              memory: 150Mi
          securityContext:
            runAsGroup: 0
            runAsUser: 0
          volumeMounts:
          - mountPath: /tls
            name: tls
        imagePullSecrets:
        - name: dockerconfigjson
        volumes:
        - name: tls
          secret:
            secretName: postgresql-server-cert

dev-sanchonet, dev-sanchonet-cardanojs-v1-stake-pool-provider, Deployment (apps) would change:

  # Source: cardanojs/templates/stake-pool-provider-deployment.yaml
  apiVersion: apps/v1
  kind: Deployment
  metadata:
    labels:
      app: stake-pool-provider
      network: sanchonet
      release: dev-sanchonet-cardanojs-v1
    name: dev-sanchonet-cardanojs-v1-stake-pool-provider
  spec:
    selector:
      matchLabels:
        app: stake-pool-provider
        network: sanchonet
        release: dev-sanchonet-cardanojs-v1
    template:
      metadata:
        labels:
          app: stake-pool-provider
          network: sanchonet
          release: dev-sanchonet-cardanojs-v1
      spec:
        containers:
        - args:
          - start-provider-server
          env:
          - name: ALLOWED_ORIGINS
            value: chrome-extension://gafhhkghbfjjkeiendhlofajokpaflmk,chrome-extension://efeiemlfnahiidnjglmehaihacglceia,chrome-extension://bjlhpephaokolembmpdcbobbpkjnoheb,chrome-extension://djcdfchkaijggdjokfomholkalbffgil,http://localhost/,http://localhost
          - name: BUILD_INFO
-           value: '{"extra":{"narHash":"sha256-4eKqhVj1+NB7pYn52O64zjL1zX4i2JvPPzjV4VqCnBg=","path":"/nix/store/7vx7flb9hsyi9qxajvs75pgax71xf1cv-source","sourceInfo":"/nix/store/7vx7flb9hsyi9qxajvs75pgax71xf1cv-source"},"lastModified":1712925538,"lastModifiedDate":"20240412123858","rev":"7cbfeed1a2ae13da8377d576049c4b007cabcac4","shortRev":"7cbfeed"}'
+           value: '{"extra":{"narHash":"sha256-KVSS8MSr73evsuY1uiYW6kn7d9UXbocojr9/8ca6Eqk=","path":"/nix/store/6lsvazpzwgh7hr7pmzyq64zmih8dmhxz-source","sourceInfo":"/nix/store/6lsvazpzwgh7hr7pmzyq64zmih8dmhxz-source"},"lastModified":1712925682,"lastModifiedDate":"20240412124122","rev":"8ab8addd2eb4b696070bca3f128a836e424f3e81","shortRev":"8ab8add"}'
          - name: DISABLE_STAKE_POOL_METRIC_APY
            value: "true"
          - name: ENABLE_METRICS
            value: "true"
          - name: LOGGER_MIN_SEVERITY
            value: debug
          - name: NETWORK
            value: sanchonet
          - name: OGMIOS_SRV_SERVICE_NAME
            value: dev-sanchonet-cardano-core.dev-sanchonet.svc.cluster.local
          - name: OVERRIDE_FUZZY_OPTIONS
            value: "true"
          - name: PAGINATION_PAGE_SIZE_LIMIT
            value: "5500"
          - name: POSTGRES_DB_STAKE_POOL
            value: stakepool
          - name: POSTGRES_HOST_STAKE_POOL
            value: dev-sanchonet-postgresql
          - name: POSTGRES_PASSWORD_STAKE_POOL
            valueFrom:
              secretKeyRef:
                key: password
                name: stakepool-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: POSTGRES_POOL_MAX_STAKE_POOL
            value: "10"
          - name: POSTGRES_PORT_STAKE_POOL
            value: "5432"
          - name: POSTGRES_SSL_CA_FILE_STAKE_POOL
            value: /tls/ca.crt
          - name: POSTGRES_SSL_STAKE_POOL
            value: "true"
          - name: POSTGRES_USER_STAKE_POOL
            valueFrom:
              secretKeyRef:
                key: username
                name: stakepool-owner-user.dev-sanchonet-postgresql.credentials.postgresql.acid.zalan.do
          - name: SERVICE_NAMES
            value: stake-pool
          - name: TOKEN_METADATA_SERVER_URL
            value: http://dev-sanchonet-cardano-stack-metadata.dev-sanchonet.svc.cluster.local
          - name: USE_BLOCKFROST
            value: "true"
          - name: USE_TYPEORM_STAKE_POOL_PROVIDER
            value: "true"
-         image: 926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:p03nzavf2r87kzr5gkkhq8m469n4h8lk
+         image: 926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:mb2pjfywr0fz845wkk82ix082271l2ga
          livenessProbe:
            httpGet:
              path: /v1.0.0/health
              port: 3000
            timeoutSeconds: 5
          name: stake-pool-provider
          ports:
          - containerPort: 3000
            name: http
          resources:
            limits:
              cpu: 500m
              memory: 300Mi
            requests:
              cpu: 100m
              memory: 150Mi
          securityContext:
            runAsGroup: 0
            runAsUser: 0
          volumeMounts:
          - mountPath: /tls
            name: tls
        imagePullSecrets:
        - name: dockerconfigjson
        volumes:
        - name: tls
          secret:
            secretName: postgresql-server-cert

michalrus self-assigned this Apr 10, 2024

michalrus mentioned this pull request Apr 10, 2024

[LW-8192] chore: adjust E2E for macOS (master) #1205

Merged

michalrus requested review from iccicci, mkazlauskas, renanvalentin, VanessaPC, mchappell, mirceahasegan and pczeglik-iohk April 10, 2024 17:14

michalrus mentioned this pull request Apr 10, 2024

Fix/LW-8192 fix for local network running on mac #932

Closed

michalrus force-pushed the chore/lw-8192-apple-silicon-conway-era branch from 8284d82 to c9b6eab Compare April 12, 2024 09:36

michalrus force-pushed the chore/lw-8192-apple-silicon-e2e-conway-era branch from a7083b3 to 4e314c9 Compare April 12, 2024 09:54

michalrus mentioned this pull request Apr 12, 2024

Merge master to conway-era #1210

Merged

michalrus force-pushed the chore/lw-8192-apple-silicon-conway-era branch from c9b6eab to 16cd96f Compare April 12, 2024 11:29

michalrus force-pushed the chore/lw-8192-apple-silicon-e2e-conway-era branch from 4e314c9 to 83b2b2d Compare April 12, 2024 11:31

mirceahasegan approved these changes Apr 12, 2024

View reviewed changes

Base automatically changed from chore/lw-8192-apple-silicon-conway-era to conway-era April 12, 2024 12:38

chore: adjust E2E for both macOSes (AArch64, x86_64)

f6902b2

LW-8192

michalrus force-pushed the chore/lw-8192-apple-silicon-e2e-conway-era branch from 83b2b2d to f6902b2 Compare April 12, 2024 12:41

michalrus merged commit e66d6a8 into conway-era Apr 12, 2024
3 of 4 checks passed

michalrus deleted the chore/lw-8192-apple-silicon-e2e-conway-era branch April 12, 2024 12:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[LW-8192] chore: adjust E2E for macOS (`conway-era`) #1206

[LW-8192] chore: adjust E2E for macOS (`conway-era`) #1206

Uh oh!

michalrus commented Apr 10, 2024 •

edited

Loading

Uh oh!

michalrus commented Apr 12, 2024

Uh oh!

mirceahasegan left a comment

Uh oh!

Uh oh!

github-actions bot commented Apr 12, 2024

Uh oh!

Uh oh!

[LW-8192] chore: adjust E2E for macOS (conway-era) #1206

[LW-8192] chore: adjust E2E for macOS (conway-era) #1206

Uh oh!

Conversation

michalrus commented Apr 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Context

Testing

Proposed Solution

Important Changes Introduced

Uh oh!

michalrus commented Apr 12, 2024

Uh oh!

mirceahasegan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Apr 12, 2024

Uh oh!

Uh oh!

[LW-8192] chore: adjust E2E for macOS (`conway-era`) #1206

[LW-8192] chore: adjust E2E for macOS (`conway-era`) #1206

michalrus commented Apr 10, 2024 •

edited

Loading