ci: replace mastersecret flag in recover (#2186)

This commit is contained in:
Otto Bittner 2023-08-09 13:00:27 +02:00 committed by GitHub
parent 29dcb72bea
commit d5e88115a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions

View File

@ -38,9 +38,6 @@ outputs:
kubeconfig: kubeconfig:
description: "The kubeconfig for the cluster." description: "The kubeconfig for the cluster."
value: ${{ steps.constellation-init.outputs.KUBECONFIG }} value: ${{ steps.constellation-init.outputs.KUBECONFIG }}
masterSecret:
description: "The master-secret for the cluster."
value: ${{ steps.constellation-init.outputs.MASTERSECRET }}
osImageUsed: osImageUsed:
description: "The OS image used in the cluster." description: "The OS image used in the cluster."
value: ${{ steps.setImage.outputs.image }} value: ${{ steps.setImage.outputs.image }}
@ -137,8 +134,7 @@ runs:
shell: bash shell: bash
run: | run: |
constellation init --force --debug constellation init --force --debug
echo "KUBECONFIG=$(pwd)/constellation-admin.conf" >> $GITHUB_OUTPUT echo "KUBECONFIG=$(pwd)/constellation-admin.conf" | tee -a $GITHUB_OUTPUT
echo "MASTERSECRET=$(pwd)/constellation-mastersecret.json" >> $GITHUB_OUTPUT
- name: Wait for nodes to join and become ready - name: Wait for nodes to join and become ready
shell: bash shell: bash

View File

@ -8,9 +8,6 @@ inputs:
kubeconfig: kubeconfig:
description: "The kubeconfig for the cluster." description: "The kubeconfig for the cluster."
required: true required: true
masterSecret:
description: "The master-secret for the cluster."
required: true
runs: runs:
using: "composite" using: "composite"
@ -40,7 +37,7 @@ runs:
start_time=$(date +%s) start_time=$(date +%s)
recovered=0 recovered=0
while true; do while true; do
output=$(constellation recover --master-secret=${{ inputs.masterSecret }} --force) output=$(constellation recover --force)
if echo "$output" | grep -q "Pushed recovery key."; then if echo "$output" | grep -q "Pushed recovery key."; then
echo "$output" echo "$output"
i=$(echo "$output" | grep -o "Pushed recovery key." | wc -l | sed 's/ //g') i=$(echo "$output" | grep -o "Pushed recovery key." | wc -l | sed 's/ //g')