Skip to content

Commit cc86512

Browse files
KyrremannReasonable-Solutionsmortenlj
committed
nais/login: den finner verdier selv nå
Co-authored-by: Carl Hedgren <[email protected]> Co-authored-by: Morten Lied Johansen <[email protected]>
1 parent b10e2d8 commit cc86512

File tree

7 files changed

+0
-32
lines changed

7 files changed

+0
-32
lines changed

docs/build/how-to/build-and-deploy.md

-5
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,13 @@ This how-to guide shows you how to build and deploy your application using [Gith
4545
id: docker-build-push
4646
with:
4747
team: <MY-TEAM> # Replace
48-
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} # Provided as Organization Secret
49-
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} # Provided as Organization Variable
5048
- name: Deploy to NAIS
5149
uses: nais/deploy/actions/deploy@v2
5250
env:
5351
CLUSTER: <MY-CLUSTER> # Replace (1)
5452
RESOURCE: .nais/app.yaml #, topic.yaml, statefulset.yaml, etc.
5553
VAR: image=${{ steps.docker-build-push.outputs.image }}
5654
TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
57-
{%- if tenant() != "nav" %}
58-
DEPLOY_SERVER: deploy.<<tenant()>>.cloud.nais.io:443
59-
{%- endif %}
6055
```
6156

6257
1. Cluster in this context is the same as the environment name. You can find the value in [workloads/environments](../../workloads/reference/environments.md).

docs/services/cdn/how-to/spa-deploy.md

-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ jobs:
5454
{%- endif %}
5555
source: <The path to your build folder or assets>
5656
environment: dev
57-
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} # Provided as Organization Secret
58-
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} # Provided as Organization Variable
5957
```
6058
6159
For more information on the inputs and outputs of the action, see the [SPA deploy action reference](../reference/spa-deploy.md).

docs/services/cdn/how-to/upload-assets.md

-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ jobs:
5757
{%- endif %}
5858
source: <The path to your build folder or assets>
5959
destination: <A destination you pick, like /my-app/dist>
60-
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} # Provided as Organization Secret
61-
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} # Provided as Organization Variable
6260

6361
- run: echo uploaded file ${{ steps.upload.outputs.uploaded }}
6462
```

docs/services/cdn/reference/spa-deploy.md

-8
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ For custom domains the `environment` must be the cluster you want to deploy to.
3434

3535
: **Optional**. The `ingressClass` for your custom domain.
3636

37-
`project_id`
38-
39-
: **Required**. Set this to `${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}`.
40-
41-
`identity_provider`
42-
43-
: **Required**. Set this to `${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}`.
44-
4537
## Outputs
4638

4739
`url`

docs/services/cdn/reference/upload-assets.md

-8
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ The action accepts the following inputs:
2121

2222
: **Required**. Destination directory.
2323

24-
`project_id`
25-
26-
: **Required**. Set this to `${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}`.
27-
28-
`identity_provider`
29-
30-
: **Required**. Set this to `${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}`.
31-
3224
`tenant`
3325

3426
: **Optional**. Tenant name.

docs/services/vulnerabilities/how-to/sbom.md

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ Simply add [nais/docker-build-push](https://github.com/nais/docker-build-push) t
1212
with:
1313
team: myteam # required
1414
salsa: true # optional, defaults to true
15-
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} # required, but is defined as an organization variable
16-
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} # required, but is defined as an organization secret
1715
# ... other options removed for readability
1816
```
1917

docs/tutorials/hello-nais.md

-5
Original file line numberDiff line numberDiff line change
@@ -126,18 +126,13 @@ Add the following content to the file, and insert the appropriate values in the
126126
id: docker-build-push
127127
with:
128128
team: <MY-TEAM> # Replace
129-
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} # Provided as Organization Secret
130-
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} # Provided as Organization Variable
131129
- name: Deploy to Nais
132130
uses: nais/deploy/actions/deploy@v2
133131
env:
134132
CLUSTER: <MY_ENV> # Replace (1)
135133
RESOURCE: .nais/app.yaml # This points to the file we created in the previous step
136134
VAR: image=${{ steps.docker-build-push.outputs.image }}
137135
TELEMETRY: ${{ steps.docker-build-push.outputs.telemetry }}
138-
{%- if tenant() != "nav" %}
139-
DEPLOY_SERVER: deploy.<<tenant()>>.cloud.nais.io:443
140-
{%- endif %}
141136
```
142137

143138
1. Cluster in this context is the same as the environment name. You can find the value in [workloads/environments](../workloads/reference/environments.md).

0 commit comments

Comments
 (0)