Skip to content

Commit dad49fa

Browse files
authored
Merge branch 'main' into fix-local-deploy
2 parents c8fd3d2 + 8efd61b commit dad49fa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- uses: zwaldowski/semver-release-action@v2
4949
with:
5050
dry_run: true
51-
bump: ${{ steps.match-label-bash.outputs.RELEASE_LABEL }}
51+
bump: minor
5252
github_token: ${{ secrets.GITHUB_TOKEN }}
5353

5454
- name: Set version output

doc/deployment-integration/local-deployment/LOCAL.MD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Exchange the pre-authorized code from the offer with an AccessToken at the autho
155155
--header 'Accept: */*' \
156156
--header 'Content-Type: application/x-www-form-urlencoded' \
157157
--data grant_type=urn:ietf:params:oauth:grant-type:pre-authorized_code \
158-
--data code=${PRE_AUTHORIZED_CODE} | jq '.access_token' -r); echo ${CREDENTIAL_ACCESS_TOKEN}
158+
--data pre-authorized_code=${PRE_AUTHORIZED_CODE} | jq '.access_token' -r); echo ${CREDENTIAL_ACCESS_TOKEN}
159159
```
160160

161161
Use the returned access token to get the actual credential:
@@ -878,4 +878,4 @@ In order to build a concrete deployment, [maven](https://maven.apache.org/) exec
878878
3. Execute `helm template` on the charts, with the local values provided for each participant(e.g. [trust-anchor](../k3s/trust-anchor.yaml), [provider](../k3s/provider.yaml) and [consumer](../k3s/consumer.yaml)) and copy the manifests to the target folder(e.g. `target/k3s`)
879879
4. Spin up the cluster
880880
5. Apply the infrastructure resources to the cluster, via `kubectl apply`
881-
6. Apply the charts to the cluster, via `kubectl apply`
881+
6. Apply the charts to the cluster, via `kubectl apply`

0 commit comments

Comments
 (0)