Skip to content

Commit

Permalink
Update config
Browse files Browse the repository at this point in the history
  • Loading branch information
kschulst committed Oct 28, 2024
1 parent bb9fad3 commit 2757cca
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 7 deletions.
42 changes: 37 additions & 5 deletions .github/workflows/deploy-to-nais.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,38 @@
name: Deploy to NAIS

on:
workflow_dispatch:
inputs:
registry:
description: Registry, for example "europe-north1-docker.pkg.dev"
required: true
type: string
repository:
description: Registry repository
required: true
type: string
image-name:
description: Image name
required: true
type: string
image-tag:
description: Tag for the image
required: true
type: string
cluster:
description: NAIS cluster environment
required: true
type: string
nais-config-path:
description: Path to the NAIS configuration file
required: true
type: string
ref:
description: "Commit reference of the deployment"
required: false
default: master
type: string

workflow_call:
inputs:
registry:
Expand Down Expand Up @@ -69,14 +101,14 @@ jobs:
ls -la ${ext_config_dir}
tree -L 6 ext-config
echo ${ext_config_dir}
ls -la ${app_config_dir}
cat ${ext_config_dir}/bootstrap-${{ inputs.cluster }}.yml
echo "ext_config=${app_config_dir}" >> $GITHUB_ENV
ls -la ${ext_config_dir}
cat ${ext_config_dir}/maskinporten-clients.yml
echo "ext_config=${ext_config_dir}" >> $GITHUB_ENV
- uses: nais/deploy/actions/deploy@v2
env:
CLUSTER: ${{ inputs.cluster }}
RESOURCE: ${{ inputs.nais-config-path }},${{ env.ext_config }}/maskinporten-client.yml
VAR: image=${{ inputs.registry }}/${{ secrets.registry-project }}/${{ inputs.repository }}/${{ inputs.image-name }}:${{ inputs.image-tag }}
RESOURCE: ${{ inputs.nais-config-path }},${{ env.ext_config }}/maskinporten-clients.yml
VAR: image=${{ inputs.registry }}/${{ secrets.NAIS_MANAGEMENT_PROJECT_ID }}/${{ inputs.repository }}/${{ inputs.image-name }}:${{ inputs.image-tag }}
DEPLOY_SERVER: deploy.ssb.cloud.nais.io:443
REF: ${{ inputs.ref }}
4 changes: 2 additions & 2 deletions .nais/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ spec:
value: /conf/logback-test.xml

filesFrom:
- configmap: guardian-application-configmap
- configmap: guardian-application-test-configmap
mountPath: /conf
- configmap: maskinporten-clients-configmap
- configmap: maskinporten-clients-test-configmap
mountPath: /conf/auth

---
Expand Down

0 comments on commit 2757cca

Please sign in to comment.