Skip to content

Commit a2080dc

Browse files
committed
add v3 instance
1 parent cd83f74 commit a2080dc

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

.github/workflows/klass-api-build-and-deploy-pr.yml renamed to .github/workflows/klass-v3-build-and-deploy.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
name: klass-api-build-and-deploy-pr.yml
1+
name: Klass v3
2+
23
on:
3-
workflow_dispatch:
4-
inputs:
5-
app:
6-
description: 'App name'
7-
type: string
8-
#push:
4+
push:
95

106
jobs:
117
build:
@@ -36,13 +32,13 @@ jobs:
3632
id: changed-files
3733
uses: "nais/what-changed@main"
3834
with:
39-
files: .nais/**/klass-api-pr.yaml
35+
files: .nais/**/klass-api-v3.yaml
4036
main-branch-name: 'main'
4137
- name: Check for test config changes
4238
id: test-config-changed
4339
uses: "nais/what-changed@main"
4440
with:
45-
files: .nais/test/klass-api-pr.yaml
41+
files: .nais/test/klass-api-v3.yaml
4642
main-branch-name: 'main'
4743

4844
- name: Build with Maven
@@ -76,9 +72,8 @@ jobs:
7672
- uses: nais/deploy/actions/deploy@v2
7773
env:
7874
CLUSTER: test
79-
RESOURCE: .nais/test/klass-api-pr.yaml
75+
RESOURCE: .nais/test/klass-api-v3.yaml
8076
DEPLOY_SERVER: deploy.ssb.cloud.nais.io:443
8177
WORKLOAD_IMAGE: ${{ needs.build.outputs.image }}
82-
VAR: app-name=${{github.event.inputs.app != null || 'pr'}}
8378
TELEMETRY: ${{ needs.build.outputs.telemetry }}
8479

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
# Deploy config for the test cluster
21
apiVersion: nais.io/v1alpha1
32
kind: Application
43
metadata:
5-
name: klass-{{ app-name }}
4+
name: klass-v3
65
namespace: dapla-metadata
76
labels:
87
shared-db: "true"
98
team: dapla-metadata
109
spec:
1110
port: 8080
12-
ttl: 1h
1311
ingresses:
14-
- https://klass-{{ app-name }}.intern.test.ssb.no/api/klass
12+
- https://klass-v3.intern.test.ssb.no/api/klass
1513
replicas:
1614
min: 1
1715
max: 1
@@ -23,11 +21,12 @@ spec:
2321
memory: 1400Mi
2422
env:
2523
- name: SPRING_PROFILES_ACTIVE
26-
value: api, postgres, remote-open-search, skip-indexing
24+
value: api, postgres, remote-open-search
2725
- name: KLASS_ENV_CLIENT_KLASS_MAIL_URL
2826
value: http://klass-mail
2927
- name: JAVA_TOOL_OPTIONS
3028
value: "-XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=75.0"
29+
3130
envFrom:
3231
- secret: google-sql-klass
3332
filesFrom:
@@ -64,4 +63,5 @@ spec:
6463

6564

6665

66+
6767

0 commit comments

Comments
 (0)