Skip to content

Commit 64ce562

Browse files
Always set service-account-jwks-uri to LB URL even with custom issuer
Signed-off-by: Shaza Aldawamneh <[email protected]>
1 parent 21e09f9 commit 64ce562

File tree

3 files changed

+71
-19
lines changed

3 files changed

+71
-19
lines changed

pkg/operator/configobservation/auth/auth_serviceaccountissuer_test.go

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,12 @@ func TestObservedConfig(t *testing.T) {
5454
expectedChange: true,
5555
},
5656
{
57-
name: "issuer set, no previous issuer",
58-
existingIssuer: "",
59-
issuer: "https://example.com",
60-
expectedIssuer: "https://example.com",
61-
expectedChange: true,
57+
name: "issuer set, no previous issuer",
58+
existingIssuer: "",
59+
issuer: "https://example.com",
60+
expectedIssuer: "https://example.com",
61+
expectInternalJWKI: true,
62+
expectedChange: true,
6263
},
6364
{
6465
name: "previous issuer was default, new is custom value",
@@ -71,10 +72,11 @@ func TestObservedConfig(t *testing.T) {
7172
expectedChange: true,
7273
},
7374
{
74-
name: "issuer set, previous issuer same",
75-
existingIssuer: "https://example.com",
76-
issuer: "https://example.com",
77-
expectedIssuer: "https://example.com",
75+
name: "issuer set, previous issuer same",
76+
existingIssuer: "https://example.com",
77+
issuer: "https://example.com",
78+
expectedIssuer: "https://example.com",
79+
expectInternalJWKI: true,
7880
},
7981
{
8082
name: "issuer set, previous issuer and trusted issuers same",
@@ -83,20 +85,23 @@ func TestObservedConfig(t *testing.T) {
8385
trustedIssuers: []string{"https://trusted.example.com"},
8486
expectedIssuer: "https://example.com",
8587
expectedTrustedIssuers: []string{"https://trusted.example.com"},
88+
expectInternalJWKI: true,
8689
},
8790
{
88-
name: "issuer set, previous issuer different",
89-
existingIssuer: "https://example.com",
90-
issuer: "https://example2.com",
91-
expectedIssuer: "https://example2.com",
92-
expectedChange: true,
91+
name: "issuer set, previous issuer different",
92+
existingIssuer: "https://example.com",
93+
issuer: "https://example2.com",
94+
expectedIssuer: "https://example2.com",
95+
expectInternalJWKI: true,
96+
expectedChange: true,
9397
},
9498
{
95-
name: "auth getter error",
96-
existingIssuer: "https://example2.com",
97-
issuer: "https://example.com",
98-
authError: expectedErrAuth,
99-
expectedIssuer: "https://example2.com",
99+
name: "auth getter error",
100+
existingIssuer: "https://example2.com",
101+
issuer: "https://example.com",
102+
authError: expectedErrAuth,
103+
expectedIssuer: "https://example2.com",
104+
expectInternalJWKI: true,
100105
},
101106
{
102107
name: "infra getter error",

tls.crt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDTDCCAjSgAwIBAgIIe7neVFYhm+swDQYJKoZIhvcNAQELBQAwRDESMBAGA1UE
3+
CxMJb3BlbnNoaWZ0MS4wLAYDVQQDEyVrdWJlLWFwaXNlcnZlci1zZXJ2aWNlLW5l
4+
dHdvcmstc2lnbmVyMB4XDTI1MDkwNDExMTczOFoXDTM1MDkwMjExMTczOFowRDES
5+
MBAGA1UECxMJb3BlbnNoaWZ0MS4wLAYDVQQDEyVrdWJlLWFwaXNlcnZlci1zZXJ2
6+
aWNlLW5ldHdvcmstc2lnbmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
7+
AQEA4JAzAjXHWK/idRjIySdCVnDemD5O3um3UbnU4Ls8zH+ZfNz2wddgBI4/z19L
8+
qQ8f7sXnGMYx+MawKA794c9nNzYTO2lvZpKhDS8wBe2AEM0wiUqAs9rOZ04r9sQd
9+
312rOmEJzQP8yO4JkPK8N+LfIFIRIdnTiThG29tkyZZPlOdXXWM7Uv+1/BI6fHVM
10+
bO6DYWBVmeAjYQhvXmL2i1J5+HQcRVQDtEmB8cBFgBuiDo1Me7AmegxpPxYpU55G
11+
hFBFZquie4au/wcl2IAAOnv7op8Rv3FMdXfxcvEM7WD68hbEvHI9kzFdPx/L5uL+
12+
a2Rxk4WD6wZ7m9KGlvYIzo2edwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAqQwDwYD
13+
VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUz3cMq9xAZLTSR7iv3xPjRouKPoswDQYJ
14+
KoZIhvcNAQELBQADggEBAAyeuB/1ii/WwK4SamiVrBg3sV9U85icko3VMDUOTALv
15+
JjMCtRBicFEJTtqLxfYUwz1EIXxxfW26UxZGgu/UWm4NVwLYrRk+f9AfzozfZsXu
16+
uBuJ0p83cbBYWKVP8H3N8y0H9FFeMXWfM3ZRR1MVVvNgA4s/GPyprRB70FybbAhv
17+
sbKNyFZHDCd0iQ9eZ9ZJCSARUl90uU7G6Ak0j+q/+YRQ2yMn3bBq84AXG37mJiAd
18+
M0bGqIMJAh0B1xUZkgNsyB9DMfUwr1XW90LuLO+HzrEcKgO6TOYMl0olGQObhx3F
19+
I7hos2ZVxP+UtQKIytuw49cIdM0aaKQ27YydcPmLib4=
20+
-----END CERTIFICATE-----

tls.key

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEpAIBAAKCAQEA4JAzAjXHWK/idRjIySdCVnDemD5O3um3UbnU4Ls8zH+ZfNz2
3+
wddgBI4/z19LqQ8f7sXnGMYx+MawKA794c9nNzYTO2lvZpKhDS8wBe2AEM0wiUqA
4+
s9rOZ04r9sQd312rOmEJzQP8yO4JkPK8N+LfIFIRIdnTiThG29tkyZZPlOdXXWM7
5+
Uv+1/BI6fHVMbO6DYWBVmeAjYQhvXmL2i1J5+HQcRVQDtEmB8cBFgBuiDo1Me7Am
6+
egxpPxYpU55GhFBFZquie4au/wcl2IAAOnv7op8Rv3FMdXfxcvEM7WD68hbEvHI9
7+
kzFdPx/L5uL+a2Rxk4WD6wZ7m9KGlvYIzo2edwIDAQABAoIBAQCox5ie+56VqLRT
8+
AErA7THt2C1lTcdnwU+YLEy0j+XVab4J2+XWsTKomeWZze0G5qhAhRv5QdWDPopd
9+
wU7OLl1MYOc5izhAZsqHJ0U331aWyjHFrmpnQ3hIqrdeY+5z2Gn+mbqNDYcr2cT0
10+
3YvbkTfUifn4cEiOZO7VBeONo9yyc3mJqKWuGKaI/DXGlReRGOZQMV4ysnZaBja1
11+
iRkCmZ6JZWvcXnDn9ZRfDQijHt9nOpql141OAXt0LgjPKiAlPtJA//bnUOrH/FpY
12+
kBn/PTTYFBF6hYJGz5+46OngWi4LNtKkVR4aLzayg/ZbBK2J24r/QOKq/oHbrDrx
13+
HSOLKUmRAoGBAPCW0dA/5/wVWhu7PRnEO/0JA8q8G1XbggtjXxF1S8NuFlye4zff
14+
uyNMjfGNOE8ed2I88dX0lbQgvbLFLOQSDsPCRuLhrbchUwR9wJiqC+sk09XKlkB7
15+
cg72t1W5ywkJJdm3zPbT8xn9dZLaqiD5pv9Va8BVlvSQEfqLslLYfvWvAoGBAO7y
16+
lm6MM7hqrvVqxPwiQ2vkCeoy4WB/KnKeAwOByvBhYY06S4kseaQ0+yfeyaL0MP5E
17+
iDc+ixwD26GBW0tyVtak0DpJDA/LafQk6umw0hVxX3okujeIcXbw/lf0pvQUj+hD
18+
R1gz9gLtNN1mXjBKYtv54eTotGw7gk/tBCUuKt25AoGBAI1xDX6x42+3GdeN15kL
19+
Xf0fzKPmvOdX+nc5f42i+Ny3Htxq6MhTdxCElDp7PKx/C86sZ7zSYySXzw6HjyGy
20+
YA3EbKo75UXxiH3udEkMR5+BciyRQo48RMz5TMVQSkZQo3kA7rX520TfVrz0Yuqp
21+
+vzHumZDq1CyVm+Gq1q7PsCvAoGAYrvKfRNhq6opcS8VBjoCMeqgTi2IAx+IoqO4
22+
CxLukDUs4fZcj+nYuYlK3kaoerT8KZSX1Hv7bzAI6MtStfIg/8BKaksUuNIMjd1T
23+
VAzEQif+k7HpYFj4yXT7I8zrz59Pd2GVcVTHKp5pYbKS6NFT2CGAvd2J788HIY+G
24+
Tvasr8ECgYB7gBuXQfViq2qqXYjn2R7/Petk7lsa/wnvxS2Eu2pSCyRGhY2MSAPh
25+
nrCAOdBKQp+qHonr25iCF55WfOnraFSmCL/6HO9uDyDcTbJfO/XBhSZ9CaZEm3gZ
26+
/To2cXnUiqwFfIGWS7PeF9i6gwWsSYt3Dpan9GsGDSK0L00laVHpbw==
27+
-----END RSA PRIVATE KEY-----

0 commit comments

Comments
 (0)