Skip to content

Commit

Permalink
Remove empty extraAnnotations
Browse files Browse the repository at this point in the history
  • Loading branch information
AndesKrrrrrrrrrrr committed Oct 17, 2024
1 parent 06c7054 commit 6b32dec
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 105 deletions.
11 changes: 4 additions & 7 deletions apps/air-discount-scheme/api/infra/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -50,11 +52,6 @@ export const serviceSetup = (services: {
staging: ['loftbru', 'loftbru-cf'],
prod: ['loftbru'],
},
extraAnnotations: {
dev: {},
staging: {},
prod: {},
},
paths: ['/api/graphql'],
public: true,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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'],
},
})
Expand Down
14 changes: 6 additions & 8 deletions apps/api/infra/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -450,11 +453,6 @@ export const serviceSetup = (services: {
prod: ['', 'www.island.is'],
},
paths: ['/api'],
extraAnnotations: {
dev: {},
staging: {},
prod: {},
},
public: true,
},
})
Expand Down
5 changes: 0 additions & 5 deletions apps/contentful-apps/infra/contentful-apps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ export const serviceSetup = (): ServiceBuilder<'contentful-apps'> =>
prod: 'contentful-apps',
},
paths: ['/'],
extraAnnotations: {
dev: {},
staging: {},
prod: {},
},
},
})
.replicaCount({
Expand Down
5 changes: 0 additions & 5 deletions apps/download-service/infra/download-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ export const serviceSetup = (services: {
prod: ['api'],
},
paths: ['/download'],
extraAnnotations: {
dev: {},
staging: {},
prod: {},
},
public: true,
},
})
Expand Down
2 changes: 0 additions & 2 deletions apps/github-actions-cache/infra/github-actions-cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ export const serviceSetup = (): ServiceBuilder<'github-actions-cache'> => {
dev: {
'nginx.ingress.kubernetes.io/enable-global-auth': 'false',
},
staging: {},
prod: {},
},
public: true,
},
Expand Down
Original file line number Diff line number Diff line change
@@ -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')
5 changes: 0 additions & 5 deletions apps/services/license-api/infra/license-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,6 @@ export const serviceSetup = (): ServiceBuilder<'license-api'> =>
},
paths: ['/'],
public: false,
extraAnnotations: {
dev: {},
staging: {},
prod: {},
},
},
})
.replicaCount({
Expand Down
11 changes: 4 additions & 7 deletions apps/services/search-indexer/infra/search-indexer-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -120,11 +122,6 @@ export const serviceSetup = (): ServiceBuilder<'search-indexer-service'> =>
prod: 'search-indexer-service.devland.is',
},
paths: ['/'],
extraAnnotations: {
dev: {},
staging: {},
prod: {},
},
},
})
.replicaCount({
Expand Down
56 changes: 25 additions & 31 deletions libs/island-ui/storybook/infra/storybook.ts
Original file line number Diff line number Diff line change
@@ -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')

0 comments on commit 6b32dec

Please sign in to comment.