Skip to content

Commit 3da33fc

Browse files
committed
Update schema and build image
1 parent 7dd00c3 commit 3da33fc

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/main.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- main
6+
- rollback
67
env:
78
NAME: console-frontend
89
IMAGE_REPOSITORY: oci://europe-north1-docker.pkg.dev/nais-io/nais
@@ -42,6 +43,8 @@ jobs:
4243
rollout:
4344
needs:
4445
- build_push
46+
# Only do this if on main
47+
if: endsWith(github.ref, '/main')
4548
runs-on: fasit-deploy
4649
permissions:
4750
id-token: write
@@ -50,4 +53,3 @@ jobs:
5053
with:
5154
chart: ${{ env.IMAGE_REPOSITORY }}/${{ env.NAME }}
5255
version: ${{ needs.build_push.outputs.version }}
53-
feature_name: ${{ env.NAME }}

schema.graphql

+4-6
Original file line numberDiff line numberDiff line change
@@ -1374,14 +1374,12 @@ type Role {
13741374
name: String!
13751375

13761376
"""
1377-
Optional service account ID if the role binding targets a service account. TODO: Make these resolvers returning service account and team, not IDs
1377+
Optional service account if the role binding targets a service account.
13781378
"""
1379-
targetServiceAccountID: ID
1379+
targetServiceAccount: ServiceAccount
13801380

1381-
"""
1382-
Optional team slug if the role binding targets a team. TODO: Make these resolvers returning service account and team, not IDs
1383-
"""
1384-
targetTeamSlug: Slug
1381+
"""Optional team if the role binding targets a team."""
1382+
targetTeam: Team
13851383
}
13861384

13871385
type Rule {

0 commit comments

Comments
 (0)