diff --git a/aspnetcore/openshift/api/Dockerfile b/aspnetcore/openshift/api/Dockerfile deleted file mode 100644 index ec9ebd8..0000000 --- a/aspnetcore/openshift/api/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -# Builder -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env -WORKDIR /build - -# Copy csproj and restore as distinct layers -COPY ["packages","./packages"] -COPY ["aspnetcore/nuget.config","./Interface/nuget.config"] -COPY ["aspnetcore/src/Interface/Interface.csproj","./Interface/Interface.csproj"] -COPY ["aspnetcore/src/ElasticService/ElasticService.csproj","./ElasticService/ElasticService.csproj"] -COPY ["aspnetcore/src/Service.Models/Service.Models.csproj","./Service.Models/Service.Models.csproj"] -COPY ["aspnetcore/src/ApiModels/ApiModels.csproj","./ApiModels/ApiModels.csproj"] -COPY ["aspnetcore/src/Logging/Logging.csproj","./Logging/Logging.csproj"] -RUN dotnet restore "Interface/Interface.csproj" - -# Copy everything else and build -COPY ["aspnetcore/src/Interface/","./Interface"] -COPY ["aspnetcore/src/ElasticService/","./ElasticService"] -COPY ["aspnetcore/src/Service.Models/","./Service.Models"] -COPY ["aspnetcore/src/ApiModels/","./ApiModels"] -COPY ["aspnetcore/src/Logging/","./Logging"] -RUN dotnet publish "Interface/Interface.csproj" -c Release -o out - -# Runtime image -FROM mcr.microsoft.com/dotnet/aspnet:6.0 -WORKDIR /app -COPY --from=build-env /build/out . -EXPOSE 8080 -ENTRYPOINT ["dotnet", "CSC.PublicApi.Interface.dll"] \ No newline at end of file diff --git a/aspnetcore/openshift/api/template-api-devel.yml b/aspnetcore/openshift/api/template-api-devel.yml deleted file mode 100644 index 3cbc0f1..0000000 --- a/aspnetcore/openshift/api/template-api-devel.yml +++ /dev/null @@ -1,99 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2022 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-api-devel - template: publicapi-api-devel - name: publicapi-api-devel -objects: - # Service (devel) - - apiVersion: v1 - kind: Service - metadata: - name: publicapi-api-service-devel - labels: - app: publicapi-api-devel - annotations: - description: Public api service for devel branch - spec: - ports: - - name: publicapi-api-port-devel - port: 8080 - targetPort: 8080 - selector: - depcfg: publicapi-api-depcfg-devel - - # ImageStream (development) - - apiVersion: v1 - kind: ImageStream - metadata: - name: publicapi-api-devel - labels: - app: publicapi-api-devel - - # BuildConfig using Docker build strategy - - apiVersion: v1 - kind: BuildConfig - metadata: - name: publicapi-api-build-devel - labels: - app: publicapi-api-devel - spec: - source: - git: - uri: https://github.com/CSCfi/research-fi-publicapi.git - ref: devel - contextDir: . - strategy: - dockerStrategy: - dockerfilePath: aspnetcore/openshift/api/Dockerfile - output: - to: - kind: ImageStreamTag - name: publicapi-api-devel:latest - successfulBuildsHistoryLimit: 4 - failedBuildsHistoryLimit: 4 - - # Deployment config (development) - - apiVersion: v1 - kind: DeploymentConfig - metadata: - name: publicapi-api-deployment-devel - labels: - app: publicapi-api-devel - spec: - selector: - app: publicapi-api-devel - depcfg: publicapi-api-depcfg-devel - template: - metadata: - labels: - app: publicapi-api-devel - depcfg: publicapi-api-depcfg-devel - spec: - containers: - - name: publicapi-api-container-devel - image: publicapi/publicapi-api-devel - imagePullPolicy: Always - ports: - - containerPort: 8080 - protocol: TCP - replicas: 1 - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - publicapi-api-container-devel - from: - kind: ImageStreamTag - name: publicapi-api-devel:latest - strategy: - type: Rolling \ No newline at end of file diff --git a/aspnetcore/openshift/api/template-api-production.yml b/aspnetcore/openshift/api/template-api-production.yml deleted file mode 100644 index 2f3785b..0000000 --- a/aspnetcore/openshift/api/template-api-production.yml +++ /dev/null @@ -1,99 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2023 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-api-production - template: publicapi-api-production - name: publicapi-api-production -objects: - # Service (production) - - apiVersion: v1 - kind: Service - metadata: - name: publicapi-api-service-production - labels: - app: publicapi-api-production - annotations: - description: Public api service for production branch - spec: - ports: - - name: publicapi-api-port-production - port: 8080 - targetPort: 8080 - selector: - depcfg: publicapi-api-depcfg-production - - # ImageStream (production) - - apiVersion: v1 - kind: ImageStream - metadata: - name: publicapi-api-production - labels: - app: publicapi-api-production - - # BuildConfig using Docker build strategy - - apiVersion: v1 - kind: BuildConfig - metadata: - name: publicapi-api-build-production - labels: - app: publicapi-api-production - spec: - source: - git: - uri: https://github.com/CSCfi/research-fi-publicapi.git - ref: main - contextDir: . - strategy: - dockerStrategy: - dockerfilePath: aspnetcore/openshift/api/Dockerfile - output: - to: - kind: ImageStreamTag - name: publicapi-api-production:latest - successfulBuildsHistoryLimit: 4 - failedBuildsHistoryLimit: 4 - - # Deployment config (production) - - apiVersion: v1 - kind: DeploymentConfig - metadata: - name: publicapi-api-deployment-production - labels: - app: publicapi-api-production - spec: - selector: - app: publicapi-api-production - depcfg: publicapi-api-depcfg-production - template: - metadata: - labels: - app: publicapi-api-production - depcfg: publicapi-api-depcfg-production - spec: - containers: - - name: publicapi-api-container-production - image: publicapi/publicapi-api-production - imagePullPolicy: Always - ports: - - containerPort: 8080 - protocol: TCP - replicas: 1 - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - publicapi-api-container-production - from: - kind: ImageStreamTag - name: publicapi-api-production:latest - strategy: - type: Rolling \ No newline at end of file diff --git a/aspnetcore/openshift/api/template-api-qa.yml b/aspnetcore/openshift/api/template-api-qa.yml deleted file mode 100644 index 915cb06..0000000 --- a/aspnetcore/openshift/api/template-api-qa.yml +++ /dev/null @@ -1,99 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2023 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-api-qa - template: publicapi-api-qa - name: publicapi-api-qa -objects: - # Service (qa) - - apiVersion: v1 - kind: Service - metadata: - name: publicapi-api-service-qa - labels: - app: publicapi-api-qa - annotations: - description: Public api service for qa branch - spec: - ports: - - name: publicapi-api-port-qa - port: 8080 - targetPort: 8080 - selector: - depcfg: publicapi-api-depcfg-qa - - # ImageStream (qa) - - apiVersion: v1 - kind: ImageStream - metadata: - name: publicapi-api-qa - labels: - app: publicapi-api-qa - - # BuildConfig using Docker build strategy - - apiVersion: v1 - kind: BuildConfig - metadata: - name: publicapi-api-build-qa - labels: - app: publicapi-api-qa - spec: - source: - git: - uri: https://github.com/CSCfi/research-fi-publicapi.git - ref: qa - contextDir: . - strategy: - dockerStrategy: - dockerfilePath: aspnetcore/openshift/api/Dockerfile - output: - to: - kind: ImageStreamTag - name: publicapi-api-qa:latest - successfulBuildsHistoryLimit: 4 - failedBuildsHistoryLimit: 4 - - # Deployment config (qa) - - apiVersion: v1 - kind: DeploymentConfig - metadata: - name: publicapi-api-deployment-qa - labels: - app: publicapi-api-qa - spec: - selector: - app: publicapi-api-qa - depcfg: publicapi-api-depcfg-qa - template: - metadata: - labels: - app: publicapi-api-qa - depcfg: publicapi-api-depcfg-qa - spec: - containers: - - name: publicapi-api-container-qa - image: publicapi/publicapi-api-qa - imagePullPolicy: Always - ports: - - containerPort: 8080 - protocol: TCP - replicas: 1 - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - publicapi-api-container-qa - from: - kind: ImageStreamTag - name: publicapi-api-qa:latest - strategy: - type: Rolling \ No newline at end of file diff --git a/aspnetcore/openshift/indexer/Dockerfile b/aspnetcore/openshift/indexer/Dockerfile deleted file mode 100644 index c09c100..0000000 --- a/aspnetcore/openshift/indexer/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -# Builder -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env -WORKDIR /build - -# Copy csproj and restore as distinct layers -COPY ["packages","./packages"] -COPY ["aspnetcore/nuget.config","./Indexer/nuget.config"] -COPY ["aspnetcore/src/Indexer/Indexer.csproj","./Indexer/Indexer.csproj"] -COPY ["aspnetcore/src/ElasticService/ElasticService.csproj","./ElasticService/ElasticService.csproj"] -COPY ["aspnetcore/src/DatabaseContext/DatabaseContext.csproj","./DatabaseContext/DatabaseContext.csproj"] -COPY ["aspnetcore/src/Repositories/Repositories.csproj","./Repositories/Repositories.csproj"] -COPY ["aspnetcore/src/Service.Models/Service.Models.csproj","./Service.Models/Service.Models.csproj"] -COPY ["aspnetcore/src/Logging/Logging.csproj","./Logging/Logging.csproj"] -RUN dotnet restore "Indexer/Indexer.csproj" - -# Copy everything else and build -COPY ["aspnetcore/src/Indexer/","./Indexer"] -COPY ["aspnetcore/src/ElasticService/","./ElasticService"] -COPY ["aspnetcore/src/DatabaseContext/","./DatabaseContext"] -COPY ["aspnetcore/src/Repositories/","./Repositories"] -COPY ["aspnetcore/src/Service.Models/","./Service.Models"] -COPY ["aspnetcore/src/Logging/","./Logging"] -RUN dotnet publish "Indexer/Indexer.csproj" -c Release -o out - -# Runtime image -FROM mcr.microsoft.com/dotnet/runtime:6.0 -WORKDIR /app -COPY --from=build-env /build/out . -ENTRYPOINT ["dotnet", "CSC.PublicApi.Indexer.dll"] \ No newline at end of file diff --git a/aspnetcore/openshift/indexer/template-indexer-app-devel.yml b/aspnetcore/openshift/indexer/template-indexer-app-devel.yml deleted file mode 100644 index fd75eb2..0000000 --- a/aspnetcore/openshift/indexer/template-indexer-app-devel.yml +++ /dev/null @@ -1,47 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2024 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-indexer-devel - template: publicapi-indexer-devel - name: publicapi-indexer-devel -objects: - # ImageStream (development) - - apiVersion: v1 - kind: ImageStream - metadata: - name: publicapi-indexer-devel - labels: - app: publicapi-indexer-devel - spec: - lookupPolicy: - local: true - - # BuildConfig using Docker build strategy - - apiVersion: v1 - kind: BuildConfig - metadata: - name: publicapi-indexer-build-devel - labels: - app: publicapi-indexer-devel - spec: - source: - git: - uri: https://github.com/CSCfi/research-fi-publicapi.git - ref: devel - contextDir: . - strategy: - dockerStrategy: - dockerfilePath: aspnetcore/openshift/indexer/Dockerfile - output: - to: - kind: ImageStreamTag - name: publicapi-indexer-devel:latest - successfulBuildsHistoryLimit: 4 - failedBuildsHistoryLimit: 4 diff --git a/aspnetcore/openshift/indexer/template-indexer-app-production.yml b/aspnetcore/openshift/indexer/template-indexer-app-production.yml deleted file mode 100644 index 4f86400..0000000 --- a/aspnetcore/openshift/indexer/template-indexer-app-production.yml +++ /dev/null @@ -1,47 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2024 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-indexer-production - template: publicapi-indexer-production - name: publicapi-indexer-production -objects: - # ImageStream (production) - - apiVersion: v1 - kind: ImageStream - metadata: - name: publicapi-indexer-production - labels: - app: publicapi-indexer-production - spec: - lookupPolicy: - local: true - - # BuildConfig using Docker build strategy - - apiVersion: v1 - kind: BuildConfig - metadata: - name: publicapi-indexer-build-production - labels: - app: publicapi-indexer-production - spec: - source: - git: - uri: https://github.com/CSCfi/research-fi-publicapi.git - ref: main - contextDir: . - strategy: - dockerStrategy: - dockerfilePath: aspnetcore/openshift/indexer/Dockerfile - output: - to: - kind: ImageStreamTag - name: publicapi-indexer-production:latest - successfulBuildsHistoryLimit: 4 - failedBuildsHistoryLimit: 4 diff --git a/aspnetcore/openshift/indexer/template-indexer-app-qa.yml b/aspnetcore/openshift/indexer/template-indexer-app-qa.yml deleted file mode 100644 index ae3410a..0000000 --- a/aspnetcore/openshift/indexer/template-indexer-app-qa.yml +++ /dev/null @@ -1,47 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2024 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-indexer-qa - template: publicapi-indexer-qa - name: publicapi-indexer-qa -objects: - # ImageStream (qa) - - apiVersion: v1 - kind: ImageStream - metadata: - name: publicapi-indexer-qa - labels: - app: publicapi-indexer-qa - spec: - lookupPolicy: - local: true - - # BuildConfig using Docker build strategy - - apiVersion: v1 - kind: BuildConfig - metadata: - name: publicapi-indexer-build-qa - labels: - app: publicapi-indexer-qa - spec: - source: - git: - uri: https://github.com/CSCfi/research-fi-publicapi.git - ref: qa - contextDir: . - strategy: - dockerStrategy: - dockerfilePath: aspnetcore/openshift/indexer/Dockerfile - output: - to: - kind: ImageStreamTag - name: publicapi-indexer-qa:latest - successfulBuildsHistoryLimit: 4 - failedBuildsHistoryLimit: 4 diff --git a/aspnetcore/openshift/indexer/template-indexer-cronjob-devel.yml b/aspnetcore/openshift/indexer/template-indexer-cronjob-devel.yml deleted file mode 100644 index 6c76306..0000000 --- a/aspnetcore/openshift/indexer/template-indexer-cronjob-devel.yml +++ /dev/null @@ -1,118 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2024 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-indexer-devel - template: publicapi-indexer-cronjob-devel - name: publicapi-indexer-cronjob-devel -objects: - # Recurring CronJob (devel) - # Indexes db entities to ElasticSearch. - - apiVersion: batch/v1beta1 - kind: CronJob - metadata: - name: publicapi-indexer-cronjob-devel - spec: - schedule: "0 1 * * *" # every day at 01:00 UTC - concurrencyPolicy: "Forbid" - startingDeadlineSeconds: 300 # Can start 5 minutes after the schedule - suspend: false - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - jobTemplate: - spec: - activeDeadlineSeconds: 2400 # Can run for 40 minutes - template: - spec: - containers: - - name: publicapi-indexer-container-devel - image: publicapi-indexer-devel - imagePullPolicy: Always - env: - - name: "ELASTICSEARCH__PASSWORD" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-devel - key: "ELASTICSEARCH__PASSWORD" - - name: "dbconnectionstring" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-devel - key: dbconnectionstring - - name: "ELASTICSEARCH__URL" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "ELASTICSEARCH__URL" - - name: "ELASTICSEARCH__USERNAME" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "ELASTICSEARCH__USERNAME" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - - name: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - - name: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - - name: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - - name: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - - name: "Serilog__MinimumLevel__Default" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__MinimumLevel__Default" - - name: "Serilog__WriteTo__HttpSink__Args__requestUri" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__WriteTo__HttpSink__Args__requestUri" - - name: "Serilog__Properties__WoodLogProjectNumber" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__Properties__WoodLogProjectNumber" - - name: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - - name: "Serilog__Properties__WoodLogUsecaseIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__Properties__WoodLogUsecaseIndexer" - - name: "QueryTimeout" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "QueryTimeout" - restartPolicy: Never diff --git a/aspnetcore/openshift/indexer/template-indexer-cronjob-production.yml b/aspnetcore/openshift/indexer/template-indexer-cronjob-production.yml deleted file mode 100644 index bb0461f..0000000 --- a/aspnetcore/openshift/indexer/template-indexer-cronjob-production.yml +++ /dev/null @@ -1,118 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2024 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-indexer-production - template: publicapi-indexer-cronjob-production - name: publicapi-indexer-cronjob-production -objects: - # Recurring CronJob (production) - # Indexes db entities to ElasticSearch. - - apiVersion: batch/v1beta1 - kind: CronJob - metadata: - name: publicapi-indexer-cronjob-production - spec: - schedule: "40 19 * * *" # every day at 19:40 UTC - concurrencyPolicy: "Forbid" - startingDeadlineSeconds: 300 # Can start 5 minutes after the schedule - suspend: false - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - jobTemplate: - spec: - activeDeadlineSeconds: 2400 # Can run for 40 minutes - template: - spec: - containers: - - name: publicapi-indexer-container-production - image: publicapi-indexer-production - imagePullPolicy: Always - env: - - name: "ELASTICSEARCH__PASSWORD" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-production - key: "ELASTICSEARCH__PASSWORD" - - name: "dbconnectionstring" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-production - key: dbconnectionstring - - name: "ELASTICSEARCH__URL" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "ELASTICSEARCH__URL" - - name: "ELASTICSEARCH__USERNAME" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "ELASTICSEARCH__USERNAME" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - - name: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - - name: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - - name: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - - name: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - - name: "Serilog__MinimumLevel__Default" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__MinimumLevel__Default" - - name: "Serilog__WriteTo__HttpSink__Args__requestUri" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__WriteTo__HttpSink__Args__requestUri" - - name: "Serilog__Properties__WoodLogProjectNumber" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__Properties__WoodLogProjectNumber" - - name: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - - name: "Serilog__Properties__WoodLogUsecaseIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__Properties__WoodLogUsecaseIndexer" - - name: "QueryTimeout" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "QueryTimeout" - restartPolicy: Never diff --git a/aspnetcore/openshift/indexer/template-indexer-cronjob-qa.yml b/aspnetcore/openshift/indexer/template-indexer-cronjob-qa.yml deleted file mode 100644 index cbc6d1f..0000000 --- a/aspnetcore/openshift/indexer/template-indexer-cronjob-qa.yml +++ /dev/null @@ -1,118 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2024 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-indexer-qa - template: publicapi-indexer-cronjob-qa - name: publicapi-indexer-cronjob-qa -objects: - # Recurring CronJob (qa) - # Indexes db entities to ElasticSearch. - - apiVersion: batch/v1beta1 - kind: CronJob - metadata: - name: publicapi-indexer-cronjob-qa - spec: - schedule: "0 2 * * *" # every day at 02:00 UTC - concurrencyPolicy: "Forbid" - startingDeadlineSeconds: 300 # Can start 5 minutes after the schedule - suspend: false - successfulJobsHistoryLimit: 3 - failedJobsHistoryLimit: 3 - jobTemplate: - spec: - activeDeadlineSeconds: 2400 # Can run for 40 minutes - template: - spec: - containers: - - name: publicapi-indexer-container-qa - image: publicapi-indexer-qa - imagePullPolicy: Always - env: - - name: "ELASTICSEARCH__PASSWORD" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-qa - key: "ELASTICSEARCH__PASSWORD" - - name: "dbconnectionstring" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-qa - key: dbconnectionstring - - name: "ELASTICSEARCH__URL" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "ELASTICSEARCH__URL" - - name: "ELASTICSEARCH__USERNAME" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "ELASTICSEARCH__USERNAME" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - - name: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - - name: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - - name: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - - name: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - - name: "Serilog__MinimumLevel__Default" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__MinimumLevel__Default" - - name: "Serilog__WriteTo__HttpSink__Args__requestUri" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__WriteTo__HttpSink__Args__requestUri" - - name: "Serilog__Properties__WoodLogProjectNumber" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__Properties__WoodLogProjectNumber" - - name: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - - name: "Serilog__Properties__WoodLogUsecaseIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__Properties__WoodLogUsecaseIndexer" - - name: "QueryTimeout" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "QueryTimeout" - restartPolicy: Never \ No newline at end of file diff --git a/aspnetcore/openshift/indexer/template-indexer-manualjob-devel.yml b/aspnetcore/openshift/indexer/template-indexer-manualjob-devel.yml deleted file mode 100644 index 70b80f8..0000000 --- a/aspnetcore/openshift/indexer/template-indexer-manualjob-devel.yml +++ /dev/null @@ -1,113 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2024 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-indexer-devel - template: publicapi-indexer-devel - name: publicapi-indexer-devel -objects: - # Single-run Job (devel) - # Use this job to index entities to ElasticSearch manually when needed. - - apiVersion: batch/v1 - kind: Job - metadata: - name: publicapi-indexer-job-devel - labels: - app: publicapi-indexer-devel - annotations: - description: ElasticSearch indexer for Public devel branch - spec: - template: - spec: - containers: - - name: publicapi-indexer-container-devel - image: publicapi-indexer-devel - imagePullPolicy: Always - env: - - name: "ELASTICSEARCH__PASSWORD" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-devel - key: "ELASTICSEARCH__PASSWORD" - - name: "dbconnectionstring" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-devel - key: dbconnectionstring - - name: "ELASTICSEARCH__URL" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "ELASTICSEARCH__URL" - - name: "ELASTICSEARCH__USERNAME" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "ELASTICSEARCH__USERNAME" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - - name: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - - name: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - - name: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - - name: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - - name: "Serilog__MinimumLevel__Default" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__MinimumLevel__Default" - - name: "Serilog__WriteTo__HttpSink__Args__requestUri" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__WriteTo__HttpSink__Args__requestUri" - - name: "Serilog__Properties__WoodLogProjectNumber" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__Properties__WoodLogProjectNumber" - - name: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - - name: "Serilog__Properties__WoodLogUsecaseIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "Serilog__Properties__WoodLogUsecaseIndexer" - - name: "QueryTimeout" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-devel - key: "QueryTimeout" - restartPolicy: Never \ No newline at end of file diff --git a/aspnetcore/openshift/indexer/template-indexer-manualjob-production.yml b/aspnetcore/openshift/indexer/template-indexer-manualjob-production.yml deleted file mode 100644 index 3667fbd..0000000 --- a/aspnetcore/openshift/indexer/template-indexer-manualjob-production.yml +++ /dev/null @@ -1,113 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2023 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-indexer-production - template: publicapi-indexer-production - name: publicapi-indexer-production -objects: - # Single-run Job (production) - # Use this job to index entities to ElasticSearch manually when needed. - - apiVersion: batch/v1 - kind: Job - metadata: - name: publicapi-indexer-job-production - labels: - app: publicapi-indexer-production - annotations: - description: ElasticSearch indexer for Public production branch - spec: - template: - spec: - containers: - - name: publicapi-indexer-container-production - image: publicapi-indexer-production - imagePullPolicy: Always - env: - - name: "ELASTICSEARCH__PASSWORD" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-production - key: "ELASTICSEARCH__PASSWORD" - - name: "dbconnectionstring" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-production - key: dbconnectionstring - - name: "ELASTICSEARCH__URL" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "ELASTICSEARCH__URL" - - name: "ELASTICSEARCH__USERNAME" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "ELASTICSEARCH__USERNAME" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - - name: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - - name: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - - name: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - - name: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - - name: "Serilog__MinimumLevel__Default" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__MinimumLevel__Default" - - name: "Serilog__WriteTo__HttpSink__Args__requestUri" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__WriteTo__HttpSink__Args__requestUri" - - name: "Serilog__Properties__WoodLogProjectNumber" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__Properties__WoodLogProjectNumber" - - name: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - - name: "Serilog__Properties__WoodLogUsecaseIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "Serilog__Properties__WoodLogUsecaseIndexer" - - name: "QueryTimeout" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-production - key: "QueryTimeout" - restartPolicy: Never \ No newline at end of file diff --git a/aspnetcore/openshift/indexer/template-indexer-manualjob-qa.yml b/aspnetcore/openshift/indexer/template-indexer-manualjob-qa.yml deleted file mode 100644 index 23ba631..0000000 --- a/aspnetcore/openshift/indexer/template-indexer-manualjob-qa.yml +++ /dev/null @@ -1,113 +0,0 @@ -# This file is part of the research.fi api -# -# Copyright 2023 Ministry of Education and Culture, Finland -# -# :author: CSC - IT Center for Science Ltd., Espoo Finland servicedesk@csc.fi -# :license: MIT -apiVersion: v1 -kind: Template -metadata: - labels: - app: publicapi-indexer-qa - template: publicapi-indexer-qa - name: publicapi-indexer-qa -objects: - # Single-run Job (qa) - # Use this job to index entities to ElasticSearch manually when needed. - - apiVersion: batch/v1 - kind: Job - metadata: - name: publicapi-indexer-job-qa - labels: - app: publicapi-indexer-qa - annotations: - description: ElasticSearch indexer for Public qa branch - spec: - template: - spec: - containers: - - name: publicapi-indexer-container-qa - image: publicapi-indexer-qa - imagePullPolicy: Always - env: - - name: "ELASTICSEARCH__PASSWORD" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-qa - key: "ELASTICSEARCH__PASSWORD" - - name: "dbconnectionstring" - valueFrom: - secretKeyRef: - name: publicapi-api-secret-qa - key: dbconnectionstring - - name: "ELASTICSEARCH__URL" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "ELASTICSEARCH__URL" - - name: "ELASTICSEARCH__USERNAME" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "ELASTICSEARCH__USERNAME" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.FundingCall.FundingCall" - - name: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.FundingDecision.FundingDecision" - - name: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.Infrastructure.Infrastructure" - - name: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.Organization.Organization" - - name: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.Publication.Publication" - - name: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "IndexNames__CSC.PublicApi.Service.Models.ResearchDataset.ResearchDataset" - - name: "Serilog__MinimumLevel__Default" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__MinimumLevel__Default" - - name: "Serilog__WriteTo__HttpSink__Args__requestUri" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__WriteTo__HttpSink__Args__requestUri" - - name: "Serilog__Properties__WoodLogProjectNumber" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__Properties__WoodLogProjectNumber" - - name: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__Properties__WoodLogRetentionMonthsIndexer" - - name: "Serilog__Properties__WoodLogUsecaseIndexer" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "Serilog__Properties__WoodLogUsecaseIndexer" - - name: "QueryTimeout" - valueFrom: - configMapKeyRef: - name: publicapi-api-config-qa - key: "QueryTimeout" - restartPolicy: Never \ No newline at end of file