-
Notifications
You must be signed in to change notification settings - Fork 0
Move dev request consumables to gitops #340
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
William-Edwards-STFC
wants to merge
13
commits into
main
Choose a base branch
from
move-reqconsumables-gitops
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
36d82a3
Remove old secrets
William-Edwards-STFC 70999bc
Remove new way of doing secrets from dev overlay as this can be kept …
William-Edwards-STFC ce23a31
Add envfrom for vault secrets to base deployment
William-Edwards-STFC 3390f2a
Add static auth for prod
William-Edwards-STFC 702080c
Add to kustomization
William-Edwards-STFC 94ddc7b
Rename static-auth to secret
William-Edwards-STFC c3b261d
Add kubernetes files to gitops for request consumables
William-Edwards-STFC 9c50bfb
Add envfrom to dev deployment
William-Edwards-STFC 10c9aaa
Accidental commits
William-Edwards-STFC ecc31a3
Remove approved experiments commits from this branch
William-Edwards-STFC 71e2ca6
Remove indentation
William-Edwards-STFC 4a87702
Fix kustomization file
William-Edwards-STFC a7157eb
Add deployment file
William-Edwards-STFC File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: request-consumables | ||
| spec: | ||
| replicas: 1 | ||
| template: | ||
| metadata: | ||
| annotations: | ||
| co.elastic.logs/processors.add_fields.target: "" | ||
| co.elastic.logs/processors.add_fields.fields.application.name: "request-consumables" | ||
| co.elastic.logs/processors.add_fields.fields.application.domain: "request-consumables" | ||
| co.elastic.logs/processors.add_fields.fields.application.tier: "service" | ||
| co.elastic.logs/processors.add_fields.fields.application.language: "javascript" | ||
| co.elastic.logs/processors.dissect.tokenizer: "[%{?timestamp}] %{log_level} - %{log_message}" | ||
| co.elastic.logs/processors.dissect.target_prefix: "" | ||
| 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: request-consumables | ||
| imagePullPolicy: Always | ||
| ports: | ||
| - containerPort: 3000 | ||
| env: | ||
| - name: CONFIG_PATH | ||
| value: /FBS/.env | ||
| volumeMounts: | ||
| - name: env-config | ||
| mountPath: "/FBS" | ||
| readOnly: true | ||
| - name: common-views | ||
| mountPath: "/app/build/common-views" | ||
| readOnly: true | ||
| - name: common-js | ||
| mountPath: "/app/build/common-public/js" | ||
| readOnly: true | ||
| readinessProbe: | ||
| httpGet: | ||
| path: /consumables/health/ready | ||
| port: 3000 | ||
| initialDelaySeconds: 10 | ||
| periodSeconds: 5 | ||
| imagePullSecrets: | ||
| - name: registry-creds | ||
| volumes: | ||
| - name: env-config | ||
| secret: | ||
| secretName: request-consumables-environment | ||
| - name: common-views | ||
| configMap: | ||
| name: common-pug-views | ||
| - name: common-js | ||
| configMap: | ||
| name: common-pug-content-js |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| apiVersion: gateway.networking.k8s.io/v1 | ||
| kind: HTTPRoute | ||
| metadata: | ||
| name: request-consumables | ||
| 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: /consumables | ||
| backendRefs: | ||
| - name: request-consumables | ||
| port: 3000 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| commonLabels: | ||
| app: request-consumables | ||
|
|
||
| namespace: apps | ||
|
|
||
| resources: | ||
| - deployment.yaml | ||
| - httproute.yaml | ||
| - service.yaml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: request-consumables | ||
| spec: | ||
| ports: | ||
| - protocol: TCP | ||
| port: 3000 | ||
| targetPort: 3000 |
17 changes: 17 additions & 0 deletions
17
components/ra/request-consumables/overlays/dev/deployment.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: request-consumables | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: request-consumables | ||
| image: ghcr.io/isisbusapps/request-consumables@sha256:3cfbda0bc1227f2e51fcdba61fc2dc86466cdf604159d9af908e66ca85883384 | ||
| env: | ||
| - name: NODE_ENV | ||
| value: development | ||
| envFrom: | ||
| - secretRef: | ||
| name: request-consumables | ||
|
|
11 changes: 11 additions & 0 deletions
11
components/ra/request-consumables/overlays/dev/kustomization.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ./../base | ||
| - static-secret.yaml | ||
|
|
||
| namespace: apps | ||
|
|
||
| patches: | ||
| - path: deployment.yaml | ||
16 changes: 16 additions & 0 deletions
16
components/ra/request-consumables/overlays/dev/static-secret.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| apiVersion: secrets.hashicorp.com/v1beta1 | ||
| kind: VaultStaticSecret | ||
| metadata: | ||
| name: request-consumables | ||
| namespace: apps | ||
| spec: | ||
| type: kv-v2 | ||
| refreshAfter: 30s | ||
| vaultAuthRef: static-auth | ||
|
|
||
| mount: reviews_and_allocations | ||
| path: dev/request-consumables | ||
| destination: | ||
| name: request-consumables | ||
| overwrite: true | ||
| create: true |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.