Skip to content

Commit 31826cb

Browse files
committed
fix: repair main CI failures
1 parent 70af9af commit 31826cb

3 files changed

Lines changed: 11 additions & 13 deletions

File tree

cmd/ateapi/internal/credbundle/credbundle_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ func TestParsePKCS8PrivateKeyBlock(t *testing.T) {
5151
}
5252
}
5353

54-
func TestParseRejectsNonPKCS8PrivateKeyBlock(t *testing.T) {
54+
func TestParseRSAPrivateKeyBlock(t *testing.T) {
5555
certDER := generateCertificate(t)
5656
bundle := append(pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certDER}), pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(generateRSAKey(t))})...)
5757

5858
bundlePath := writeBundle(t, bundle)
59-
if _, err := Parse(bundlePath); err == nil {
60-
t.Fatalf("Parse() error = nil, want unsupported private key block error")
59+
if _, err := Parse(bundlePath); err != nil {
60+
t.Fatalf("Parse() error = %v", err)
6161
}
6262
}
6363

manifests/ate-install/jwt/kustomization.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,10 @@ patches:
4444
namespace: ate-system
4545
patch: |-
4646
- op: add
47-
path: /spec/template/spec/containers/0/args/-
48-
value: --ateapi-auth=jwt
49-
- op: add
50-
path: /spec/template/spec/containers/0/args/-
51-
value: --ateapi-token-file=/run/ateapi-token/token
47+
path: /spec/template/spec/containers/0/args
48+
value:
49+
- --ateapi-auth=jwt
50+
- --ateapi-token-file=/run/ateapi-token/token
5251
- target:
5352
group: apps
5453
version: v1

manifests/ate-install/kind-jwt/kustomization.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ patches:
3838
namespace: ate-system
3939
patch: |-
4040
- op: add
41-
path: /spec/template/spec/containers/0/args/-
42-
value: --ateapi-auth=jwt
43-
- op: add
44-
path: /spec/template/spec/containers/0/args/-
45-
value: --ateapi-token-file=/run/ateapi-token/token
41+
path: /spec/template/spec/containers/0/args
42+
value:
43+
- --ateapi-auth=jwt
44+
- --ateapi-token-file=/run/ateapi-token/token
4645
- target:
4746
group: apps
4847
version: v1

0 commit comments

Comments
 (0)