mirror of
https://github.com/k3s-io/k3s.git
synced 2026-02-03 20:39:49 -05:00
Fix lines to satisfy lint
Signed-off-by: Manuel Buil <mbuil@suse.com>
This commit is contained in:
parent
e61c3b5862
commit
c24294f24f
2 changed files with 3 additions and 4 deletions
2
.github/workflows/integration.yaml
vendored
2
.github/workflows/integration.yaml
vendored
|
|
@ -98,7 +98,7 @@ jobs:
|
|||
## If no one connects after 5 minutes, shut down server.
|
||||
wait-timeout-minutes: 5
|
||||
- name: Generate coverage report
|
||||
run: go tool covdata textfmt -i $GOCOVERDIR -o ${{ matrix.itest }}.out
|
||||
run: sudo -E env "PATH=$PATH" go tool covdata textfmt -i $GOCOVERDIR -o ${{ matrix.itest }}.out
|
||||
- name: Upload Results To Codecov
|
||||
uses: codecov/codecov-action@v5
|
||||
with:
|
||||
|
|
|
|||
|
|
@ -88,9 +88,8 @@ func encryptionStatus(control *config.Control) (EncryptionState, error) {
|
|||
}
|
||||
if providers[len(providers)-1].Identity != nil && (providers[0].AESCBC != nil || providers[0].Secretbox != nil) {
|
||||
state.Enable = ptr.To(true)
|
||||
} else if control.EncryptSecrets && providers[0].Identity != nil && len(providers) == 1 {
|
||||
state.Enable = ptr.To(false)
|
||||
} else if !control.EncryptSecrets || providers[0].Identity != nil && (providers[1].AESCBC != nil || providers[1].Secretbox != nil) {
|
||||
} else if (control.EncryptSecrets && providers[0].Identity != nil && len(providers) == 1) ||
|
||||
(!control.EncryptSecrets || providers[0].Identity != nil && (providers[1].AESCBC != nil || providers[1].Secretbox != nil)) {
|
||||
state.Enable = ptr.To(false)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue