Skip to content

Commit

Permalink
first-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
james-jdgtl committed Jul 22, 2024
1 parent c7d70fd commit 759f864
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 59 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
FROM public.ecr.aws/ubuntu/ubuntu@sha256:4f5ca1c8b7abe2bd1162e629cafbd824c303b98954b1a168526aca6021f8affe

LABEL org.opencontainers.image.vendor="Ministry of Justice" \
org.opencontainers.image.authors="Analytical Platform" \
org.opencontainers.image.authors="HMPPS DPS" \
org.opencontainers.image.title="Actions Runner" \
org.opencontainers.image.description="Actions Runner image for Analytical Platform" \
org.opencontainers.image.url="https://github.com/ministryofjustice/analytical-platform-actions-runner"
org.opencontainers.image.description="Actions Runner image for HMPPS DPS" \
org.opencontainers.image.url="https://github.com/ministryofjustice/hmpps-github-actions-runner"

ENV CONTAINER_USER="runner" \
CONTAINER_UID="10000" \
Expand Down
2 changes: 1 addition & 1 deletion helm_deploy/hmpps-github-actions-runner/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: '1.0'
description: A Helm chart for Kubernetes
name: hmpps-github-discovery
name: hmpps-github-actions-runner
version: 0.2.0
dependencies:
- name: generic-service
Expand Down
68 changes: 29 additions & 39 deletions helm_deploy/hmpps-github-actions-runner/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,60 +2,50 @@
generic-service:
nameOverride: hmpps-github-discovery

replicaCount: 1
replicaCount: 1 # we can start with one and do more

image:
repository: ghcr.io/ministryofjustice/hmpps-github-discovery
repository: ghcr.io/ministryofjustice/hmpps-github-actions-runner
tag: xxx # override at deployment time
port: 8080
# port: 8080 # Not opening a port any more

ingress:
enabled: false

# Due to a bug cant disable/override the sub chart.
# https://github.com/helm/helm/pull/12162
# Have implemented a basic http health endpoint, until this bug is fixed.
#livenessProbe: null
#readinessProbe: null

livenessProbe:
httpGet:
path: /ping
port: 8080
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 5

readinessProbe:
httpGet:
path: /ping
port: 8080
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 5

# Environment variables to load into the deployment
env:
REFRESH_INTERVAL: "7200"
LOG_LEVEL: debug
# Looks like it might be fixed, so...

livenessProbe: null
readinessProbe: null

# livenessProbe:
# httpGet:
# path: /ping
# port: 8080
# initialDelaySeconds: 10
# periodSeconds: 10
# timeoutSeconds: 5
# failureThreshold: 5

# readinessProbe:
# httpGet:
# path: /ping
# port: 8080
# initialDelaySeconds: 10
# periodSeconds: 10
# timeoutSeconds: 5
# failureThreshold: 5

# Pre-existing kubernetes secrets to load as environment variables in the deployment.
# namespace_secrets:
# [name of kubernetes secret]:
# [name of environment variable as seen by app]: [key of kubernetes secret to load]

namespace_secrets:
hmpps-github-discovery:
SERVICE_CATALOGUE_API_ENDPOINT: "SERVICE_CATALOGUE_API_ENDPOINT"
SERVICE_CATALOGUE_API_KEY: "SERVICE_CATALOGUE_API_KEY"
GITHUB_APP_ID: "GITHUB_APP_ID"
GITHUB_APP_INSTALLATION_ID: "GITHUB_APP_INSTALLATION_ID"
GITHUB_APP_PRIVATE_KEY: "GITHUB_APP_PRIVATE_KEY"
CIRCLECI_TOKEN: "CIRCLECI_TOKEN"
CIRCLECI_API_ENDPOINT: "CIRCLECI_API_ENDPOINT"
SLACK_BOT_TOKEN: "SLACK_BOT_TOKEN"
hmpps-github-actions-runner:
GITHUB_REPOSITORY: "GITHUB_REPOSITORY"
GITHUB_TOKEN: "GITHUB_TOKEN"

generic-prometheus-alerts:
targetApplication: hmpps-github-discovery
targetApplication: hmpps-github-actions-runner
11 changes: 1 addition & 10 deletions helm_deploy/values-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
---
# Per environment values which override defaults in hmpps-github-discovery/values.yaml

generic-service:
env:
REFRESH_INTERVAL_HOURS: "6"
LOG_LEVEL: debug

namespace_secrets:
hmpps-github-discovery:
SC_FILTER: "SC_FILTER"
# Per environment values which override defaults in hmpps-github-actions-runner/values.yaml

generic-prometheus-alerts:
alertSeverity: hmpps-sre-alerts-dev
7 changes: 1 addition & 6 deletions helm_deploy/values-prod.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
---
# Per environment values which override defaults in hmpps-github-discovery/values.yaml

generic-service:
env:
REFRESH_INTERVAL_HOURS: "6"
LOG_LEVEL: info
# Per environment values which override defaults in hmpps-github-actions-runner/values.yaml

generic-prometheus-alerts:
alertSeverity: hmpps-sre-alerts

0 comments on commit 759f864

Please sign in to comment.