Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions argocd/dev/ra/proposal-allocations-v2/app.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: proposal-allocations-v2
namespace: argocd
spec:
goTemplate: true
goTemplateOptions: ["missingkey=error"]
generators:
- clusters:
selector:
matchLabels:
appEnvironment: dev
ignoreApplicationDifferences:
- jsonPointers:
- /spec/syncPolicy
template:
metadata:
name: '{{.name}}-proposal-allocations-v2'
spec:
project: r-a-project
source:
path: components/ra/proposal-allocations-v2/overlays/dev
repoURL: 'https://github.com/isisbusapps/gitops'
targetRevision: main
destination:
namespace: apps
name: '{{.name}}'
syncPolicy:
automated:
selfHeal: true #https://argo-cd.readthedocs.io/en/stable/user-guide/auto_sync/#automatic-self-healing
30 changes: 30 additions & 0 deletions argocd/prod/ra/proposal-allocations-v2/app.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: proposal-allocations-v2
namespace: argocd
spec:
goTemplate: true
goTemplateOptions: ["missingkey=error"]
generators:
- clusters:
selector:
matchLabels:
appEnvironment: prod
ignoreApplicationDifferences:
- jsonPointers:
- /spec/syncPolicy
template:
metadata:
name: '{{.name}}-proposal-allocations-v2'
spec:
project: r-a-project
source:
path: components/ra/proposal-allocations-v2/overlays/prod
repoURL: 'https://github.com/isisbusapps/gitops'
targetRevision: main
destination:
namespace: apps
name: '{{.name}}'
syncPolicy:
automated: {}
44 changes: 44 additions & 0 deletions components/ra/proposal-allocations-v2/base/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: proposal-allocations-v2
spec:
replicas: 1
template:
metadata:
annotations:
co.elastic.logs/processors.1.add_fields.target: ""
co.elastic.logs/processors.1.add_fields.fields.application.name: "proposal-allocations"
co.elastic.logs/processors.1.add_fields.fields.application.domain: "proposal-allocations"
co.elastic.logs/processors.1.add_fields.fields.application.tier: "service"
co.elastic.logs/processors.1.add_fields.fields.application.language: "java"
# Extract log_level, class, and log_message as separate fields for elastic
co.elastic.logs/processors.2.dissect.tokenizer: "%{?date} %{?time} %{log_level} [%{?Session_and_user_data}] [%{class}] %{log_message}"
co.elastic.logs/processors.2.dissect.target_prefix: ""
# Extract web method call time stats to separate fields
co.elastic.logs/processors.3.dissect.tokenizer: "Web method %{web_method.name} completed in %{web_method.seconds_taken|double} seconds"
co.elastic.logs/processors.3.dissect.target_prefix: ""
co.elastic.logs/processors.3.dissect.field: "log_message"
co.elastic.logs/processors.3.dissect.when.regexp.log_message: "Web method .* completed in .* seconds"

co.elastic.logs/multiline.pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}"
co.elastic.logs/multiline.negate: "true"
co.elastic.logs/multiline.match: "after"
spec:
containers:
- name: proposal-allocations
imagePullPolicy: Always
ports:
- containerPort: 5050
volumeMounts:
- name: spring-config
mountPath: "/FBS/Apps/spring/proposal-allocations"
readOnly: true
readinessProbe:
httpGet:
path: /proposal-allocations/v2/actuator/health/readiness
port: 5050
initialDelaySeconds: 10
periodSeconds: 5
imagePullSecrets:
- name: registry-creds
19 changes: 19 additions & 0 deletions components/ra/proposal-allocations-v2/base/http-route.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: proposal-allocations
spec:
parentRefs:
- name: envoy-gateway
namespace: envoy-gateway-system
hostnames:
- "*.developers.facilities.rl.ac.uk"
- "*.facilities.rl.ac.uk"
rules:
- matches:
- path:
type: PathPrefix
value: /proposal-allocations/v2
backendRefs:
- name: proposal-allocations-v2
port: 5050
24 changes: 24 additions & 0 deletions components/ra/proposal-allocations-v2/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

commonLabels:
app: proposal-allocations-v2

labels:
- pairs:
bypass-alloy-scraper:
includeSelectors: false
includeTemplates: true

labels:
- pairs:
bypass-alloy-scraper:
includeSelectors: false
includeTemplates: true

namespace: apps

resources:
- deployment.yaml
- service.yaml
- http-route.yaml
10 changes: 10 additions & 0 deletions components/ra/proposal-allocations-v2/base/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: proposal-allocations-v2
spec:
ports:
- name: https
protocol: TCP
port: 5050
targetPort: 5050
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: proposal-allocations-v2
spec:
template:
spec:
containers:
- name: proposal-allocations
image: ghcr.io/isisbusapps/proposal-allocations@sha256:5e4011da9add76769045657479425e90aded9007907fa7608dea24c566d8cad7
ports:
- containerPort: 7005
env:
- name: APP_ENV
value: dev
- name: JAVA_TOOL_OPTIONS
value: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7005 -Dlog4j2.formatMsgNoLookups=true
volumes:
- name: spring-config
secret:
secretName: proposal-allocations-profiles
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- ../../base

namespace: apps

patches:
- path: deployment.yaml
- path: service.yaml
10 changes: 10 additions & 0 deletions components/ra/proposal-allocations-v2/overlays/dev/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: proposal-allocations-v2
spec:
ports:
- name: debug
protocol: TCP
port: 7005
targetPort: 7005
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: proposal-allocations-v2
spec:
template:
spec:
containers:
- name: proposal-allocations
image: ghcr.io/isisbusapps/proposal-allocations:2.1.1
env:
- name: APP_ENV
value: prod
- name: JAVA_TOOL_OPTIONS
value: -Dlog4j2.formatMsgNoLookups=true
volumes:
- name: spring-config
secret:
secretName: proposal-allocations-profiles
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- ../../base

namespace: apps

patches:
- path: deployment.yaml