From a549e8bbbf1a91f7a8c88d562c017d201ef09b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 14 May 2024 22:09:40 +0200 Subject: [PATCH 1/5] Remove entur infra config --- Dockerfile | 8 -- api/apiproxy/flexible-lines.xml | 36 --------- .../policies/assignMessage.addCors.xml | 31 -------- .../flowCallout.generalStackdriverLogging.xml | 7 -- ...lowCallout.getEnvironmentConfiguration.xml | 22 ----- .../policies/flowCallout.replaceTargetUrl.xml | 22 ----- api/apiproxy/policies/spikeArrest.xml | 23 ------ api/apiproxy/proxies/flexible-lines-v1.xml | 64 --------------- api/apiproxy/targets/flexible-lines-v1.xml | 47 ----------- helm/uttu/Chart.lock | 6 -- helm/uttu/Chart.yaml | 17 ---- helm/uttu/charts/common-1.17.5.tgz | Bin 14343 -> 0 bytes helm/uttu/env/values-kub-ent-dev.yaml | 33 -------- helm/uttu/env/values-kub-ent-prd.yaml | 35 -------- helm/uttu/env/values-kub-ent-tst.yaml | 32 -------- helm/uttu/templates/_helpers.tpl | 37 --------- helm/uttu/templates/configmap.yaml | 75 ------------------ helm/uttu/templates/ingress.yaml | 21 ----- helm/uttu/templates/uttu-psql-configmap.yaml | 9 --- helm/uttu/values.yaml | 48 ----------- terraform/.tool-versions | 1 - terraform/backend.tf | 6 -- terraform/env/kub-ent-dev.tfvars | 3 - terraform/env/kub-ent-prd.tfvars | 3 - terraform/env/kub-ent-tst.tfvars | 3 - terraform/main.tf | 61 -------------- terraform/variables.tf | 45 ----------- 27 files changed, 695 deletions(-) delete mode 100644 Dockerfile delete mode 100644 api/apiproxy/flexible-lines.xml delete mode 100644 api/apiproxy/policies/assignMessage.addCors.xml delete mode 100644 api/apiproxy/policies/flowCallout.generalStackdriverLogging.xml delete mode 100644 api/apiproxy/policies/flowCallout.getEnvironmentConfiguration.xml delete mode 100644 api/apiproxy/policies/flowCallout.replaceTargetUrl.xml delete mode 100644 api/apiproxy/policies/spikeArrest.xml delete mode 100644 api/apiproxy/proxies/flexible-lines-v1.xml delete mode 100644 api/apiproxy/targets/flexible-lines-v1.xml delete mode 100644 helm/uttu/Chart.lock delete mode 100644 helm/uttu/Chart.yaml delete mode 100644 helm/uttu/charts/common-1.17.5.tgz delete mode 100644 helm/uttu/env/values-kub-ent-dev.yaml delete mode 100644 helm/uttu/env/values-kub-ent-prd.yaml delete mode 100644 helm/uttu/env/values-kub-ent-tst.yaml delete mode 100644 helm/uttu/templates/_helpers.tpl delete mode 100644 helm/uttu/templates/configmap.yaml delete mode 100644 helm/uttu/templates/ingress.yaml delete mode 100644 helm/uttu/templates/uttu-psql-configmap.yaml delete mode 100644 helm/uttu/values.yaml delete mode 100644 terraform/.tool-versions delete mode 100644 terraform/backend.tf delete mode 100644 terraform/env/kub-ent-dev.tfvars delete mode 100644 terraform/env/kub-ent-prd.tfvars delete mode 100644 terraform/env/kub-ent-tst.tfvars delete mode 100644 terraform/main.tf delete mode 100644 terraform/variables.tf diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 02e7a85e..00000000 --- a/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM bellsoft/liberica-openjdk-alpine:21.0.3-10 -RUN apk update && apk upgrade && apk add --no-cache \ - tini -WORKDIR /deployments -COPY target/uttu-*-SNAPSHOT.jar uttu.jar -RUN addgroup appuser && adduser --disabled-password appuser --ingroup appuser -USER appuser -CMD [ "/sbin/tini", "--", "java", "-jar", "uttu.jar" ] diff --git a/api/apiproxy/flexible-lines.xml b/api/apiproxy/flexible-lines.xml deleted file mode 100644 index a4d7daea..00000000 --- a/api/apiproxy/flexible-lines.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - flexible-lines - flexible-lines - - assignMessage.addCors - flowCallout.getEnvironmentConfiguration - flowCallout.generalStackdriverLogging - flowCalloutreplaceTargetUrl - spikeArrest - - - flexible-lines-v1 - - - - - - flexible-lines-v1 - - diff --git a/api/apiproxy/policies/assignMessage.addCors.xml b/api/apiproxy/policies/assignMessage.addCors.xml deleted file mode 100644 index ac07e628..00000000 --- a/api/apiproxy/policies/assignMessage.addCors.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - assignMessage.addCors - - - - -
*
-
*
-
3628800
-
GET, PUT, POST, DELETE
- - - true - - diff --git a/api/apiproxy/policies/flowCallout.generalStackdriverLogging.xml b/api/apiproxy/policies/flowCallout.generalStackdriverLogging.xml deleted file mode 100644 index e1703aef..00000000 --- a/api/apiproxy/policies/flowCallout.generalStackdriverLogging.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - flowCallout.generalStackdriverLogging - - - generalStackdriverLogging - \ No newline at end of file diff --git a/api/apiproxy/policies/flowCallout.getEnvironmentConfiguration.xml b/api/apiproxy/policies/flowCallout.getEnvironmentConfiguration.xml deleted file mode 100644 index e695faef..00000000 --- a/api/apiproxy/policies/flowCallout.getEnvironmentConfiguration.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - flowCallout.getEnvironmentConfiguration - - - fetchEnvironmentConfiguration - diff --git a/api/apiproxy/policies/flowCallout.replaceTargetUrl.xml b/api/apiproxy/policies/flowCallout.replaceTargetUrl.xml deleted file mode 100644 index 9ad4dbef..00000000 --- a/api/apiproxy/policies/flowCallout.replaceTargetUrl.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - flowCallout.replaceTargetUrl - - - replaceTargetUrl - diff --git a/api/apiproxy/policies/spikeArrest.xml b/api/apiproxy/policies/spikeArrest.xml deleted file mode 100644 index bce44598..00000000 --- a/api/apiproxy/policies/spikeArrest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - spikeArrest - - - 600pm - false - diff --git a/api/apiproxy/proxies/flexible-lines-v1.xml b/api/apiproxy/proxies/flexible-lines-v1.xml deleted file mode 100644 index e2b414a1..00000000 --- a/api/apiproxy/proxies/flexible-lines-v1.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - assignMessage.addCors - - - request.verb == "OPTIONS" AND request.header.origin != null AND request.header.Access-Control-Request-Method != null - - - - - - - flowCallout.generalStackdriverLogging - - - - - - - - spikeArrest - - - - flowCallout.getEnvironmentConfiguration - - - - - - /timetable-admin/v1/flexible-lines - - entur - - - request.verb == "OPTIONS" AND request.header.origin != null AND request.header.Access-Control-Request-Method != null - - - flexible-lines-v1 - - diff --git a/api/apiproxy/targets/flexible-lines-v1.xml b/api/apiproxy/targets/flexible-lines-v1.xml deleted file mode 100644 index 9c7b624d..00000000 --- a/api/apiproxy/targets/flexible-lines-v1.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - flowCallout.generalStackdriverLogging - - - - - - - - - - - flowCallout.replaceTargetUrl - - - - - - assignMessage.addCors - - - - - - https://timetable-admin-v1-flexible-lines-gcp2.INGRESS_ENVIRONMENT/services/flexible-lines - - \ No newline at end of file diff --git a/helm/uttu/Chart.lock b/helm/uttu/Chart.lock deleted file mode 100644 index d30894ea..00000000 --- a/helm/uttu/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: https://entur.github.io/helm-charts - version: 1.17.5 -digest: sha256:548d4b1e40dd575cb2036735ec04bd469d8cea4c4f32e372cf3b9513ee621912 -generated: "2024-01-19T15:17:31.306013614+01:00" diff --git a/helm/uttu/Chart.yaml b/helm/uttu/Chart.yaml deleted file mode 100644 index c82c6888..00000000 --- a/helm/uttu/Chart.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v2 -appVersion: "0.1.80" -description: Backend for flexible transport editor -name: uttu -version: 0.1.0 -keywords: - - uttu -sources: - - https://github.com/entur/uttu -maintainers: - - name: 'team-ror' - email: team.rutedata@entur.org -engine: gotpl -dependencies: - - name: common - version: 1.17.5 - repository: "https://entur.github.io/helm-charts" \ No newline at end of file diff --git a/helm/uttu/charts/common-1.17.5.tgz b/helm/uttu/charts/common-1.17.5.tgz deleted file mode 100644 index 7bf75b4e09615ede723f0631c8923443bb2d3858..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14343 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

R@^7jt|5kbLh4+)=msgpq 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 BYXtxR diff --git a/helm/uttu/env/values-kub-ent-dev.yaml b/helm/uttu/env/values-kub-ent-dev.yaml deleted file mode 100644 index 1a6f48ff..00000000 --- a/helm/uttu/env/values-kub-ent-dev.yaml +++ /dev/null @@ -1,33 +0,0 @@ -common: - env: dev - deployment: - replicas: 1 - -sql: - instance: ent-uttu-dev:europe-west1:uttu-db-pg13=tcp:5432 - -ingress: - domainName: -gcp2.dev.entur.io - - -configMap: - organisationRegistryUrl: https://api.dev.entur.io/organisations/v1/register/organisations - stopplaceRegistryUrl: https://api.dev.entur.io/stop-places/v1/read - auth0: - ror: - url: https://ror-entur-dev.eu.auth0.com/ - audience: https://ror.api.dev.entur.io - partner: - url: https://partner.dev.entur.org/ - client: - tokenUri: https://partner.dev.entur.org/oauth/token - clientId: 4a5zhKZaENqIl1u0m5blot8sYKVTUIec - orgRegister: - audience: https://api.dev.entur.io - pubsubProjectId: ent-marduk-dev - blobstoreProjectId: ent-marduk-dev - blobstoreContainerName: marduk-exchange-dev - logLevel: DEBUG - flywayTable: schema_version - exportQueueName: FlexibleLinesExportQueue - exportBlobFolder: inbound/uttu/ \ No newline at end of file diff --git a/helm/uttu/env/values-kub-ent-prd.yaml b/helm/uttu/env/values-kub-ent-prd.yaml deleted file mode 100644 index 89e2c0d1..00000000 --- a/helm/uttu/env/values-kub-ent-prd.yaml +++ /dev/null @@ -1,35 +0,0 @@ -common: - env: prd - deployment: - replicas: 2 - container: - forceReplicas: 2 - -sql: - instance: ent-uttu-prd:europe-west1:uttu-db-pg13=tcp:5432 - -ingress: - domainName: -gcp2.entur.io - - -configMap: - organisationRegistryUrl: https://api.entur.io/organisations/v1/register/organisations - stopplaceRegistryUrl: https://api.entur.io/stop-places/v1/read - auth0: - ror: - url: https://auth2.entur.org/ - audience: https://ror.api.entur.io - partner: - url: https://partner.entur.org/ - client: - tokenUri: https://partner.entur.org/oauth/token - clientId: 1ZZMds7c0urOXHAMuklhv2puDcdVUQIW - orgRegister: - audience: https://api.entur.io - pubsubProjectId: ent-marduk-prd - blobstoreProjectId: ent-marduk-prd - blobstoreContainerName: marduk-exchange-production - logLevel: INFO - flywayTable: flyway_schema_history - exportQueueName: FlexibleLinesExportQueue - exportBlobFolder: inbound/uttu/ diff --git a/helm/uttu/env/values-kub-ent-tst.yaml b/helm/uttu/env/values-kub-ent-tst.yaml deleted file mode 100644 index 944d9349..00000000 --- a/helm/uttu/env/values-kub-ent-tst.yaml +++ /dev/null @@ -1,32 +0,0 @@ -common: - env: tst - deployment: - replicas: 1 - -sql: - instance: ent-uttu-tst:europe-west1:uttu-db-pg13=tcp:5432 - -ingress: - domainName: -gcp2.staging.entur.io - -configMap: - organisationRegistryUrl: https://api.staging.entur.io/organisations/v1/register/organisations - stopplaceRegistryUrl: https://api.staging.entur.io/stop-places/v1/read - auth0: - ror: - url: https://ror-entur-staging.eu.auth0.com/ - audience: https://ror.api.staging.entur.io - partner: - url: https://partner.staging.entur.org/ - client: - tokenUri: https://partner.staging.entur.org/oauth/token - clientId: AXXN2zBqjVWKOp2uJGXv44ehaQwkHUJS - orgRegister: - audience: https://api.staging.entur.io - pubsubProjectId: ent-marduk-tst - blobstoreProjectId: ent-marduk-tst - blobstoreContainerName: marduk-exchange-test - logLevel: INFO - flywayTable: flyway_schema_history - exportQueueName: FlexibleLinesExportQueue - exportBlobFolder: inbound/uttu/ diff --git a/helm/uttu/templates/_helpers.tpl b/helm/uttu/templates/_helpers.tpl deleted file mode 100644 index d811ac18..00000000 --- a/helm/uttu/templates/_helpers.tpl +++ /dev/null @@ -1,37 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "app.name" -}} -uttu -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "app.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - - -{{/* Generate basic labels */}} -{{- define "uttu.common.labels" }} -app: {{ template "app.name" . }} -chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} -release: {{ .Release.Name }} -team: ror -slack: talk-ror -environment: {{ .Values.common.env }} -namespace: {{ .Release.Namespace }} -{{- end }} \ No newline at end of file diff --git a/helm/uttu/templates/configmap.yaml b/helm/uttu/templates/configmap.yaml deleted file mode 100644 index 17a5fa52..00000000 --- a/helm/uttu/templates/configmap.yaml +++ /dev/null @@ -1,75 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "app.name" . }}-application - namespace: {{ .Release.Namespace }} - labels: - {{- include "uttu.common.labels" . | indent 4 }} -data: - application.properties: |- - organisation.registry.url={{ .Values.configMap.organisationRegistryUrl }} - stopplace.registry.url={{ .Values.configMap.stopplaceRegistryUrl }} - export.notify.enabled=true - export.notify.queue.name={{ .Values.configMap.exportQueueName }} - export.blob.folder={{ .Values.configMap.exportBlobFolder }} - export.blob.filenameSuffix=-flexible-lines - export.blob.commonFileFilenameSuffix=_flexible_shared_data - export.working.folder=/tmp/export - - # gcs - blobstore.gcs.project.id={{ .Values.configMap.blobstoreProjectId }} - blobstore.gcs.container.name={{ .Values.configMap.blobstoreContainerName }} - - # pubsub - spring.cloud.gcp.pubsub.project-id={{ .Values.configMap.pubsubProjectId }} - spring.cloud.gcp.pubsub.subscriber.parallel-pull-count=1 - spring.cloud.gcp.pubsub.subscriber.executor-threads=30 - spring.cloud.gcp.pubsub.subscriber.max-ack-extension-period=36000 - - # Database properties - spring.jpa.open-in-view=false - spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false - spring.jpa.database=POSTGRESQL - spring.jpa.hibernate.ddl-auto=none - spring.database.driverClassName=org.postgresql.Driver - spring.datasource.url=jdbc:postgresql://localhost:5432/uttu - spring.datasource.platform=postgres - spring.datasource.username=uttu - spring.flyway.table={{ .Values.configMap.flywayTable }} - - #OAuth2 Resource Server - - # OAuth2 Resource Server - uttu.oauth2.resourceserver.auth0.ror.claim.namespace=https://ror.entur.io/ - - # OAuth2 Resource Server for Entur Partner tenant - uttu.oauth2.resourceserver.auth0.entur.partner.jwt.issuer-uri={{ .Values.configMap.auth0.partner.url }} - uttu.oauth2.resourceserver.auth0.entur.partner.jwt.audience={{ .Values.configMap.auth0.ror.audience }} - - # OAuth2 Resource Server for RoR tenant - uttu.oauth2.resourceserver.auth0.ror.jwt.issuer-uri={{ .Values.configMap.auth0.ror.url }} - uttu.oauth2.resourceserver.auth0.ror.jwt.audience={{ .Values.configMap.auth0.ror.audience }} - - - #Oauth2 Client - spring.security.oauth2.client.provider.orgregister.token-uri={{ .Values.configMap.auth0.client.tokenUri }} - spring.security.oauth2.client.registration.orgregister.client-id={{ .Values.configMap.auth0.client.clientId }} - spring.security.oauth2.client.registration.orgregister.authorization-grant-type=client_credentials - orgregister.oauth2.client.audience={{ .Values.configMap.orgRegister.audience }} - - # Spring Actuator - management.server.port= {{ .Values.common.service.internalPort }} - management.endpoints.enabled-by-default=false - management.endpoint.info.enabled=true - management.endpoint.health.enabled=true - management.endpoint.health.group.readiness.include=readinessState,db,pubSub - management.endpoint.prometheus.enabled=true - management.endpoints.web.exposure.include=info,health,prometheus - - # Logging - logging.level.no.entur.uttu={{ .Values.configMap.logLevel }} - logging.level.no.entur.uttu.health.rest.HealthResource=INFO - - # Profile - spring.profiles.active=gcs-blobstore,entur,entur-legacy-organisation-registry - spring.main.allow-bean-definition-overriding=true diff --git a/helm/uttu/templates/ingress.yaml b/helm/uttu/templates/ingress.yaml deleted file mode 100644 index 516bf334..00000000 --- a/helm/uttu/templates/ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - labels: - traffic-type: api - {{- include "uttu.common.labels" . | indent 4 }} - annotations: - kubernetes.io/ingress.class: traefik - name: timetable-admin-v1-flexible-lines - namespace: {{ .Release.Namespace }} -spec: - rules: - - host: timetable-admin-v1-flexible-lines{{ .Values.ingress.domainName }} - http: - paths: - - pathType: ImplementationSpecific - backend: - service: - name: {{ template "app.name" . }} - port: - number: {{ .Values.common.service.externalPort }} \ No newline at end of file diff --git a/helm/uttu/templates/uttu-psql-configmap.yaml b/helm/uttu/templates/uttu-psql-configmap.yaml deleted file mode 100644 index dc04b2ad..00000000 --- a/helm/uttu/templates/uttu-psql-configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -data: - INSTANCES: {{.Values.sql.instance}} -kind: ConfigMap -metadata: - name: uttu-psql-connection - namespace: {{ .Release.Namespace }} - labels: - {{- include "uttu.common.labels" . | indent 4 }} diff --git a/helm/uttu/values.yaml b/helm/uttu/values.yaml deleted file mode 100644 index 947c72df..00000000 --- a/helm/uttu/values.yaml +++ /dev/null @@ -1,48 +0,0 @@ -common: - app: uttu - shortname: uttu - team: ror - ingress: - enabled: false - service: - externalPort: 80 - internalPort: 8080 - container: - forceReplicas: 1 - image: <+artifacts.primary.image> - cpu: 1 - memory: 2000 - memoryLimit: 3000 - probes: - liveness: - path: /actuator/health/liveness - readiness: - path: /actuator/health/readiness - prometheus: - enabled: true - path: /actuator/prometheus - volumeMounts: - - mountPath: /etc/application-config - name: application-config - readOnly: true - volumes: - - configMap: - defaultMode: 420 - name: uttu-application - name: application-config - postgres: - enabled: true - memory: 40 - - configmap: - data: - JDK_JAVA_OPTIONS: -server -Xmx2048m -Xss1024m -Dspring.config.location=/etc/application-config/application.properties - -Dfile.encoding=UTF-8 - TZ: Europe/Oslo - enabled: true - toEnv: true - secrets: - psql-credentials: - - SPRING_DATASOURCE_PASSWORD - auth: - - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_ORGREGISTER_CLIENT_SECRET diff --git a/terraform/.tool-versions b/terraform/.tool-versions deleted file mode 100644 index 6c6e3fe8..00000000 --- a/terraform/.tool-versions +++ /dev/null @@ -1 +0,0 @@ -terraform 0.13.2 diff --git a/terraform/backend.tf b/terraform/backend.tf deleted file mode 100644 index d1c6b07f..00000000 --- a/terraform/backend.tf +++ /dev/null @@ -1,6 +0,0 @@ -# Describe where terraform will store the state of infrastructure -terraform { - backend "gcs" { - bucket = "ent-gcs-tfa-uttu" - } -} diff --git a/terraform/env/kub-ent-dev.tfvars b/terraform/env/kub-ent-dev.tfvars deleted file mode 100644 index fa89b827..00000000 --- a/terraform/env/kub-ent-dev.tfvars +++ /dev/null @@ -1,3 +0,0 @@ -gcp_resources_project = "ent-uttu-dev" -gcp_pubsub_project = "ent-marduk-dev" -uttu_service_account="serviceAccount:application@ent-uttu-dev.iam.gserviceaccount.com" \ No newline at end of file diff --git a/terraform/env/kub-ent-prd.tfvars b/terraform/env/kub-ent-prd.tfvars deleted file mode 100644 index 7115631c..00000000 --- a/terraform/env/kub-ent-prd.tfvars +++ /dev/null @@ -1,3 +0,0 @@ -gcp_resources_project = "ent-uttu-prd" -gcp_pubsub_project = "ent-marduk-prd" -uttu_service_account="serviceAccount:application@ent-uttu-prd.iam.gserviceaccount.com" \ No newline at end of file diff --git a/terraform/env/kub-ent-tst.tfvars b/terraform/env/kub-ent-tst.tfvars deleted file mode 100644 index 3b2dfdbf..00000000 --- a/terraform/env/kub-ent-tst.tfvars +++ /dev/null @@ -1,3 +0,0 @@ -gcp_resources_project = "ent-uttu-tst" -gcp_pubsub_project = "ent-marduk-tst" -uttu_service_account="serviceAccount:application@ent-uttu-tst.iam.gserviceaccount.com" \ No newline at end of file diff --git a/terraform/main.tf b/terraform/main.tf deleted file mode 100644 index 75af1070..00000000 --- a/terraform/main.tf +++ /dev/null @@ -1,61 +0,0 @@ -# Contains main description of bulk of terraform? -terraform { - required_version = ">= 0.13.2" -} - -provider "google" { - version = "~> 4.84.0" -} -provider "kubernetes" { - version = ">= 2.13.1" -} - -variable "gcp_pubsub_project" { - default = "The GCP pubsub project gcp2" -} - -resource "google_sql_database_instance" "db_instance_pg13" { - name = "uttu-db-pg13" - project = var.gcp_resources_project - region = "europe-west1" - - settings { - tier = var.db_tier - user_labels = var.labels - availability_type = "ZONAL" - backup_configuration { - enabled = true - } - ip_configuration { - require_ssl = true - } - } - database_version = "POSTGRES_13" -} - -resource "google_sql_database" "db_pg13" { - name = "uttu" - project = var.gcp_resources_project - instance = google_sql_database_instance.db_instance_pg13.name -} - -data "google_secret_manager_secret_version" "db_password" { - secret = "SPRING_DATASOURCE_PASSWORD" - project = var.gcp_resources_project -} - -resource "google_sql_user" "db-user_pg13" { - project = var.gcp_resources_project - instance = google_sql_database_instance.db_instance_pg13.name - name = "uttu" - password = data.google_secret_manager_secret_version.db_password.secret_data -} - -# add service account as member to pubsub service in the gcp2 project - -resource "google_pubsub_topic_iam_member" "pubsub_topic_iam_member" { - project = var.gcp_pubsub_project - topic = var.pubsub_topic_name - role = var.service_account_pubsub_role - member = var.uttu_service_account -} diff --git a/terraform/variables.tf b/terraform/variables.tf deleted file mode 100644 index e49e8712..00000000 --- a/terraform/variables.tf +++ /dev/null @@ -1,45 +0,0 @@ -variable "gcp_resources_project" { - description = "The GCP project id" -} - -variable "kube_namespace" { - description = "The Kubernetes namespace" - default = "uttu" -} - -variable "labels" { - description = "Labels used in all resources" - type = map(string) - default = { - manager = "terraform" - team = "ror" - slack = "talk-ror" - app = "uttu" - } -} - - -variable "db_tier" { - description = "Database instance tier" - default = "db-custom-1-3840" -} - -variable "db_backup_enabled" { - description = "Enabled automated db backup" - default = false -} - -variable "pubsub_topic_name" { - description = "PubSub Topic name" - default = "FlexibleLinesExportQueue" -} - -variable "service_account_pubsub_role" { - description = "Role of the Service Account - more about roles https://cloud.google.com/pubsub/docs/access-control" - default = "roles/pubsub.publisher" -} - -variable "uttu_service_account" { - description = "application service account" -} - From b39120885cd04624dc8c7e2b94750742d4c5747b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 14 May 2024 22:22:14 +0200 Subject: [PATCH 2/5] Publish jar to jfrog instead of building docker image --- .circleci/config.yml | 102 +++++++++++++++++++------------------------ pom.xml | 9 ++++ 2 files changed, 55 insertions(+), 56 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7a3b7bb..254283f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,45 +1,18 @@ version: 2 aliases: - - &google-sdk-container-config - docker: - - image: google/cloud-sdk:latest - auth: - username: $DOCKERHUB_LOGIN - password: $DOCKERHUB_PASSWORD - - &GCP-auth-docker - name: GCP authentication with docker - command: | - echo $DOCKER_PASSWORD > ${HOME}/account-auth.json - &jfrog-login name: Rename jfrog environment variable for maven setting.xml command: | echo "export JFROG_USER=$ARTIFACTORY_USER" >> $BASH_ENV echo "export JFROG_PASS=$ARTIFACTORY_PASSWORD" >> $BASH_ENV - - &tag-git-version - name: Tag git commit with build version and push to github + - &post_build + name: Trigger downstream builds command: | - git config --global user.email "circleci@entur.no" - git config --global user.name "circleci" - git tag $VERSION - git push origin $VERSION - - &create-image-version - name: Create new image version and store to env var and as file in workspace - command: | - echo "export VERSION=$CIRCLE_BRANCH-v$CIRCLE_BUILD_NUM-$(echo -n $CIRCLE_SHA1 | tail -c 8)" >> $BASH_ENV - echo "$CIRCLE_BRANCH-v$CIRCLE_BUILD_NUM-$(echo -n $CIRCLE_SHA1 | tail -c 8)" > version - - &read-image-version - name: Read new image version from workspace - command: | - echo "export VERSION=$(cat ./version)" >> $BASH_ENV - - &docker-build-and-push - name: Docker build and push - command: | - IMAGE="eu.gcr.io/entur-system-1287/${CIRCLE_PROJECT_REPONAME}" - echo "Image: ${IMAGE}" - docker build -t $IMAGE . - docker tag $IMAGE "${IMAGE}":"${VERSION}" - docker login -u _json_key --password-stdin https://eu.gcr.io < ${HOME}/account-auth.json - docker push "${IMAGE}":"${VERSION}" + wget https://raw.githubusercontent.com/entur/circleci-toolbox-image-java11/master/tools/trigger_build_v2.sh -O .circleci/trigger_build_v2.sh + chmod +x .circleci/trigger_build_v2.sh + echo 'export CIRCLE_SHA1="$CIRCLE_SHA1"' >> $BASH_ENV + echo 'export CIRCLE_PROJECT_REPONAME="$CIRCLE_PROJECT_REPONAME"' >> $BASH_ENV + .circleci/trigger_build_v2.sh "entur/lamassu-deployment-config.git" "master" "$(git log -1 --pretty=%B)" - &sonar-scan name: Sonar scan command: | @@ -55,7 +28,8 @@ aliases: -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.token=${ENTUR_SONAR_PASSWORD} jobs: - build: + test: + executor: machine machine: image: ubuntu-2204:2024.04.3 environment: @@ -94,36 +68,52 @@ jobs: path: ~/junit - store_artifacts: path: ~/junit - - run: *create-image-version - - run: *tag-git-version - persist_to_workspace: root: ~/project paths: - target - - Dockerfile - .circleci - - ./version - deploy-docker: - <<: *google-sdk-container-config + build: + docker: + - image: cimg/openjdk:21.0.2-node + auth: + username: $DOCKERHUB_LOGIN + password: $DOCKERHUB_PASSWORD + environment: + MAVEN_OPTS: -Xmx3G steps: - - setup_remote_docker: - version: default - docker_layer_caching: true - - attach_workspace: - at: ~/project - - run: *GCP-auth-docker - - run: *read-image-version - - run: *docker-build-and-push + - checkout + - restore_cache: + keys: + - dep-cache-v2-{{ checksum "pom.xml" }} + - dep-cache-v2- + - run: + name: Download Maven settings + command: wget https://raw.githubusercontent.com/entur/circleci-toolbox-image-java11/master/tools/m2/settings.xml -O .circleci/settings.xml + - run: *jfrog-login + - run: + name: Refresh cache + command: mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.0:go-offline -s .circleci/settings.xml + - save_cache: + paths: + - ~/.m2 + key: dep-cache-v2-{{ checksum "pom.xml" }} + # Cannot use -o because of snapshot dependencies. + - run: mvn deploy -s .circleci/settings.xml -P prettierSkip -DskipTests + - run: *post_build workflows: - version: 2 - build_test_deploy: + version: 2.1 + release: jobs: - - build: + - test: + name: test-release context: global - - deploy-docker: + - build: + name: build-release context: global - requires: - - build filters: branches: - only: master + only: + - master + requires: + - test-release diff --git a/pom.xml b/pom.xml index 34d7e59c..1da5d63d 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,15 @@ 0.22 write + + + + snapshots + entur2-snapshots + https://entur2.jfrog.io/entur2/libs-snapshot-local + + + osgeo From 378eb1909134ccf9c2264daa52103e558c34749d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 14 May 2024 22:23:22 +0200 Subject: [PATCH 3/5] Fix circleci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 254283f4..1ae8ada4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,7 +102,7 @@ jobs: - run: mvn deploy -s .circleci/settings.xml -P prettierSkip -DskipTests - run: *post_build workflows: - version: 2.1 + version: 2 release: jobs: - test: From 696ed903d3534149c965c957092c6828834f28e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 14 May 2024 22:26:21 +0200 Subject: [PATCH 4/5] Fix circleci --- .circleci/config.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ae8ada4..22b17196 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,4 @@ -version: 2 +version: 2.1 aliases: - &jfrog-login name: Rename jfrog environment variable for maven setting.xml @@ -102,18 +102,15 @@ jobs: - run: mvn deploy -s .circleci/settings.xml -P prettierSkip -DskipTests - run: *post_build workflows: - version: 2 release: jobs: - test: - name: test-release context: global - build: - name: build-release context: global filters: branches: only: - master requires: - - test-release + - test From d56168532ac058dc230ce2519edfe7467561da94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 14 May 2024 22:26:58 +0200 Subject: [PATCH 5/5] Fix circleci --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22b17196..64d65c32 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,6 @@ aliases: -Dsonar.token=${ENTUR_SONAR_PASSWORD} jobs: test: - executor: machine machine: image: ubuntu-2204:2024.04.3 environment: