diff --git a/apps/air-discount-scheme/api/infra/api.ts b/apps/air-discount-scheme/api/infra/api.ts index 9a0604437188..2c763b7d44fe 100644 --- a/apps/air-discount-scheme/api/infra/api.ts +++ b/apps/air-discount-scheme/api/infra/api.ts @@ -23,10 +23,12 @@ export const serviceSetup = (services: { prod: 'https://innskra.island.is', }, ELASTIC_NODE: { - dev: 'https://vpc-search-njkekqydiegezhr4vqpkfnw5la.eu-west-1.es.amazonaws.com', + dev: + 'https://vpc-search-njkekqydiegezhr4vqpkfnw5la.eu-west-1.es.amazonaws.com', staging: 'https://vpc-search-q6hdtjcdlhkffyxvrnmzfwphuq.eu-west-1.es.amazonaws.com', - prod: 'https://vpc-search-mw4w5c2m2g5edjrtvwbpzhkw24.eu-west-1.es.amazonaws.com', + prod: + 'https://vpc-search-mw4w5c2m2g5edjrtvwbpzhkw24.eu-west-1.es.amazonaws.com', }, BACKEND_URL: ref((h) => `http://${h.svc(services.adsBackend)}`), CONTENTFUL_HOST: { @@ -50,11 +52,6 @@ export const serviceSetup = (services: { staging: ['loftbru', 'loftbru-cf'], prod: ['loftbru'], }, - extraAnnotations: { - dev: {}, - staging: {}, - prod: {}, - }, paths: ['/api/graphql'], public: true, }, diff --git a/apps/air-discount-scheme/backend/infra/air-discount-scheme-backend.ts b/apps/air-discount-scheme/backend/infra/air-discount-scheme-backend.ts index a70c6fce0f28..670bdc48e4dc 100644 --- a/apps/air-discount-scheme/backend/infra/air-discount-scheme-backend.ts +++ b/apps/air-discount-scheme/backend/infra/air-discount-scheme-backend.ts @@ -36,10 +36,12 @@ export const serviceSetup = (): ServiceBuilder<'air-discount-scheme-backend'> => .migrations() .redis({ host: { - dev: 'clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379', + dev: + 'clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379', staging: 'clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379', - prod: 'clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379', + prod: + 'clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379', }, }) .ingress({ @@ -49,11 +51,6 @@ export const serviceSetup = (): ServiceBuilder<'air-discount-scheme-backend'> => staging: ['loftbru', 'loftbru-cf'], prod: 'loftbru', }, - extraAnnotations: { - dev: {}, - staging: {}, - prod: {}, - }, paths: ['/api/swagger', '/api/public'], }, }) diff --git a/apps/api/infra/api.ts b/apps/api/infra/api.ts index e42d4bbfec28..861e2087dc73 100644 --- a/apps/api/infra/api.ts +++ b/apps/api/infra/api.ts @@ -99,10 +99,12 @@ export const serviceSetup = (services: { prod: 'https://innskra.island.is/api', }, ELASTIC_NODE: { - dev: 'https://vpc-search-njkekqydiegezhr4vqpkfnw5la.eu-west-1.es.amazonaws.com', + dev: + 'https://vpc-search-njkekqydiegezhr4vqpkfnw5la.eu-west-1.es.amazonaws.com', staging: 'https://vpc-search-q6hdtjcdlhkffyxvrnmzfwphuq.eu-west-1.es.amazonaws.com/', - prod: 'https://vpc-search-mw4w5c2m2g5edjrtvwbpzhkw24.eu-west-1.es.amazonaws.com/', + prod: + 'https://vpc-search-mw4w5c2m2g5edjrtvwbpzhkw24.eu-west-1.es.amazonaws.com/', }, CONTENTFUL_HOST: { @@ -161,7 +163,8 @@ export const serviceSetup = (services: { XROAD_FINANCES_TIMEOUT: '20000', XROAD_CHARGE_FJS_V2_TIMEOUT: '20000', AUTH_DELEGATION_API_URL: { - dev: 'http://web-services-auth-delegation-api.identity-server-delegation.svc.cluster.local', + dev: + 'http://web-services-auth-delegation-api.identity-server-delegation.svc.cluster.local', staging: 'http://web-services-auth-delegation-api.identity-server-delegation.svc.cluster.local', prod: 'https://auth-delegation-api.internal.innskra.island.is', @@ -450,11 +453,6 @@ export const serviceSetup = (services: { prod: ['', 'www.island.is'], }, paths: ['/api'], - extraAnnotations: { - dev: {}, - staging: {}, - prod: {}, - }, public: true, }, }) diff --git a/apps/contentful-apps/infra/contentful-apps.ts b/apps/contentful-apps/infra/contentful-apps.ts index a8d9fa935cc2..d7ddf9bdc504 100644 --- a/apps/contentful-apps/infra/contentful-apps.ts +++ b/apps/contentful-apps/infra/contentful-apps.ts @@ -12,11 +12,6 @@ export const serviceSetup = (): ServiceBuilder<'contentful-apps'> => prod: 'contentful-apps', }, paths: ['/'], - extraAnnotations: { - dev: {}, - staging: {}, - prod: {}, - }, }, }) .replicaCount({ diff --git a/apps/download-service/infra/download-service.ts b/apps/download-service/infra/download-service.ts index 6b0a23201f20..94c0e4c5ac8a 100644 --- a/apps/download-service/infra/download-service.ts +++ b/apps/download-service/infra/download-service.ts @@ -64,11 +64,6 @@ export const serviceSetup = (services: { prod: ['api'], }, paths: ['/download'], - extraAnnotations: { - dev: {}, - staging: {}, - prod: {}, - }, public: true, }, }) diff --git a/apps/github-actions-cache/infra/github-actions-cache.ts b/apps/github-actions-cache/infra/github-actions-cache.ts index 89293d86e6e1..159cc7a03e76 100644 --- a/apps/github-actions-cache/infra/github-actions-cache.ts +++ b/apps/github-actions-cache/infra/github-actions-cache.ts @@ -23,8 +23,6 @@ export const serviceSetup = (): ServiceBuilder<'github-actions-cache'> => { dev: { 'nginx.ingress.kubernetes.io/enable-global-auth': 'false', }, - staging: {}, - prod: {}, }, public: true, }, diff --git a/apps/services/contentful-entry-tagger/infra/contentful-entry-tagger-service.ts b/apps/services/contentful-entry-tagger/infra/contentful-entry-tagger-service.ts index 0a7a3f7410bc..09d1e30f650c 100644 --- a/apps/services/contentful-entry-tagger/infra/contentful-entry-tagger-service.ts +++ b/apps/services/contentful-entry-tagger/infra/contentful-entry-tagger-service.ts @@ -1,31 +1,25 @@ import { service, ServiceBuilder } from '../../../../infra/src/dsl/dsl' -export const serviceSetup = - (): ServiceBuilder<'contentful-entry-tagger-service'> => - service('contentful-entry-tagger-service') - .image('services-contentful-entry-tagger') - .namespace('contentful-entry-tagger') - .serviceAccount('contentful-entry-tagger') - .secrets({ - CONTENTFUL_MANAGEMENT_ACCESS_TOKEN: - '/k8s/contentful-entry-tagger/CONTENTFUL_MANAGEMENT_ACCESS_TOKEN', - CONTENTFUL_REQUEST_TOKEN: - '/k8s/contentful-entry-tagger/CONTENTFUL_REQUEST_TOKEN', - }) - .ingress({ - primary: { - host: { - dev: 'contentful-entry-tagger-service', - staging: 'contentful-entry-tagger-service', - prod: 'contentful-entry-tagger-service.devland.is', - }, - paths: ['/'], - extraAnnotations: { - dev: {}, - staging: {}, - prod: {}, - }, +export const serviceSetup = (): ServiceBuilder<'contentful-entry-tagger-service'> => + service('contentful-entry-tagger-service') + .image('services-contentful-entry-tagger') + .namespace('contentful-entry-tagger') + .serviceAccount('contentful-entry-tagger') + .secrets({ + CONTENTFUL_MANAGEMENT_ACCESS_TOKEN: + '/k8s/contentful-entry-tagger/CONTENTFUL_MANAGEMENT_ACCESS_TOKEN', + CONTENTFUL_REQUEST_TOKEN: + '/k8s/contentful-entry-tagger/CONTENTFUL_REQUEST_TOKEN', + }) + .ingress({ + primary: { + host: { + dev: 'contentful-entry-tagger-service', + staging: 'contentful-entry-tagger-service', + prod: 'contentful-entry-tagger-service.devland.is', }, - }) - .liveness('/liveness') - .readiness('/readiness') + paths: ['/'], + }, + }) + .liveness('/liveness') + .readiness('/readiness') diff --git a/apps/services/license-api/infra/license-api.ts b/apps/services/license-api/infra/license-api.ts index 05957d748959..1b5d32886203 100644 --- a/apps/services/license-api/infra/license-api.ts +++ b/apps/services/license-api/infra/license-api.ts @@ -78,11 +78,6 @@ export const serviceSetup = (): ServiceBuilder<'license-api'> => }, paths: ['/'], public: false, - extraAnnotations: { - dev: {}, - staging: {}, - prod: {}, - }, }, }) .replicaCount({ diff --git a/apps/services/search-indexer/infra/search-indexer-service.ts b/apps/services/search-indexer/infra/search-indexer-service.ts index e6b2c827d044..d1883123e70a 100644 --- a/apps/services/search-indexer/infra/search-indexer-service.ts +++ b/apps/services/search-indexer/infra/search-indexer-service.ts @@ -3,10 +3,12 @@ import { ref, service, ServiceBuilder } from '../../../../infra/src/dsl/dsl' const envs = { APPLICATION_URL: 'http://search-indexer-service', ELASTIC_NODE: { - dev: 'https://vpc-search-njkekqydiegezhr4vqpkfnw5la.eu-west-1.es.amazonaws.com', + dev: + 'https://vpc-search-njkekqydiegezhr4vqpkfnw5la.eu-west-1.es.amazonaws.com', staging: 'https://vpc-search-q6hdtjcdlhkffyxvrnmzfwphuq.eu-west-1.es.amazonaws.com', - prod: 'https://vpc-search-mw4w5c2m2g5edjrtvwbpzhkw24.eu-west-1.es.amazonaws.com', + prod: + 'https://vpc-search-mw4w5c2m2g5edjrtvwbpzhkw24.eu-west-1.es.amazonaws.com', }, ELASTIC_INDEX: 'island-is', CONTENTFUL_SPACE: '8k0h54kbe6bj', @@ -120,11 +122,6 @@ export const serviceSetup = (): ServiceBuilder<'search-indexer-service'> => prod: 'search-indexer-service.devland.is', }, paths: ['/'], - extraAnnotations: { - dev: {}, - staging: {}, - prod: {}, - }, }, }) .replicaCount({ diff --git a/libs/island-ui/storybook/infra/storybook.ts b/libs/island-ui/storybook/infra/storybook.ts index a32559e34d61..24c9931de6b2 100644 --- a/libs/island-ui/storybook/infra/storybook.ts +++ b/libs/island-ui/storybook/infra/storybook.ts @@ -1,34 +1,28 @@ import { service, ServiceBuilder } from '../../../../infra/src/dsl/dsl' -export const serviceSetup = - (services: {}): ServiceBuilder<'island-ui-storybook'> => - service('island-ui-storybook') - .namespace('storybook') - .liveness('/liveness') - .readiness('/readiness') - .resources({ - limits: { - cpu: '200m', - memory: '256Mi', +export const serviceSetup = (services: {}): ServiceBuilder<'island-ui-storybook'> => + service('island-ui-storybook') + .namespace('storybook') + .liveness('/liveness') + .readiness('/readiness') + .resources({ + limits: { + cpu: '200m', + memory: '256Mi', + }, + requests: { + cpu: '10m', + memory: '128Mi', + }, + }) + .ingress({ + primary: { + host: { + dev: 'ui', + staging: 'ui', + prod: 'ui.devland.is', }, - requests: { - cpu: '10m', - memory: '128Mi', - }, - }) - .ingress({ - primary: { - extraAnnotations: { - dev: {}, - staging: {}, - prod: {}, - }, - host: { - dev: 'ui', - staging: 'ui', - prod: 'ui.devland.is', - }, - paths: ['/'], - }, - }) - .grantNamespaces('nginx-ingress-external') + paths: ['/'], + }, + }) + .grantNamespaces('nginx-ingress-external')