Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 33995d7

Browse filesBrowse files
aramasearamase
committed
Duplicate v1beta1 AuthenticationConfiguration to v1
Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
1 parent c96032a commit 33995d7
Copy full SHA for 33995d7

File tree

Expand file treeCollapse file tree

6 files changed

+1057
-62
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+1057
-62
lines changed

‎pkg/kubeapiserver/options/authentication_test.go

Copy file name to clipboardExpand all lines: pkg/kubeapiserver/options/authentication_test.go
+36-36Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ func TestToAuthenticationConfig_Anonymous(t *testing.T) {
546546
name: "file-anonymous-disabled-AnonymousAuthConfigurableEndpoints-disabled",
547547
args: []string{
548548
"--authentication-config=" + writeTempFile(t, `
549-
apiVersion: apiserver.config.k8s.io/v1alpha1
549+
apiVersion: apiserver.config.k8s.io/v1
550550
kind: AuthenticationConfiguration
551551
anonymous:
552552
enabled: false
@@ -559,7 +559,7 @@ anonymous:
559559
enableAnonymousEndpoints: true,
560560
args: []string{
561561
"--authentication-config=" + writeTempFile(t, `
562-
apiVersion: apiserver.config.k8s.io/v1alpha1
562+
apiVersion: apiserver.config.k8s.io/v1
563563
kind: AuthenticationConfiguration
564564
anonymous:
565565
enabled: false
@@ -572,7 +572,7 @@ anonymous:
572572
Anonymous: &apiserver.AnonymousAuthConfig{Enabled: false},
573573
},
574574
AuthenticationConfigData: `
575-
apiVersion: apiserver.config.k8s.io/v1alpha1
575+
apiVersion: apiserver.config.k8s.io/v1
576576
kind: AuthenticationConfiguration
577577
anonymous:
578578
enabled: false
@@ -585,7 +585,7 @@ anonymous:
585585
enableAnonymousEndpoints: true,
586586
args: []string{
587587
"--authentication-config=" + writeTempFile(t, `
588-
apiVersion: apiserver.config.k8s.io/v1alpha1
588+
apiVersion: apiserver.config.k8s.io/v1
589589
kind: AuthenticationConfiguration
590590
anonymous:
591591
enabled: true
@@ -598,7 +598,7 @@ anonymous:
598598
Anonymous: &apiserver.AnonymousAuthConfig{Enabled: true},
599599
},
600600
AuthenticationConfigData: `
601-
apiVersion: apiserver.config.k8s.io/v1alpha1
601+
apiVersion: apiserver.config.k8s.io/v1
602602
kind: AuthenticationConfiguration
603603
anonymous:
604604
enabled: true
@@ -611,7 +611,7 @@ anonymous:
611611
enableAnonymousEndpoints: true,
612612
args: []string{
613613
"--authentication-config=" + writeTempFile(t, `
614-
apiVersion: apiserver.config.k8s.io/v1alpha1
614+
apiVersion: apiserver.config.k8s.io/v1
615615
kind: AuthenticationConfiguration
616616
anonymous:
617617
enabled: false
@@ -626,7 +626,7 @@ anonymous:
626626
enableAnonymousEndpoints: true,
627627
args: []string{
628628
"--authentication-config=" + writeTempFile(t, `
629-
apiVersion: apiserver.config.k8s.io/v1alpha1
629+
apiVersion: apiserver.config.k8s.io/v1
630630
kind: AuthenticationConfiguration
631631
anonymous:
632632
conditions:
@@ -640,7 +640,7 @@ anonymous:
640640
enableAnonymousEndpoints: true,
641641
args: []string{
642642
"--authentication-config=" + writeTempFile(t, `
643-
apiVersion: apiserver.config.k8s.io/v1alpha1
643+
apiVersion: apiserver.config.k8s.io/v1
644644
kind: AuthenticationConfiguration
645645
anonymous:
646646
enabled: true
@@ -669,7 +669,7 @@ anonymous:
669669
},
670670
},
671671
AuthenticationConfigData: `
672-
apiVersion: apiserver.config.k8s.io/v1alpha1
672+
apiVersion: apiserver.config.k8s.io/v1
673673
kind: AuthenticationConfiguration
674674
anonymous:
675675
enabled: true
@@ -684,7 +684,7 @@ anonymous:
684684
enableAnonymousEndpoints: true,
685685
args: []string{"--anonymous-auth=True",
686686
"--authentication-config=" + writeTempFile(t, `
687-
apiVersion: apiserver.config.k8s.io/v1alpha1
687+
apiVersion: apiserver.config.k8s.io/v1
688688
kind: AuthenticationConfiguration
689689
anonymous:
690690
enabled: true
@@ -697,7 +697,7 @@ anonymous:
697697
enableAnonymousEndpoints: true,
698698
args: []string{"--anonymous-auth=True",
699699
"--authentication-config=" + writeTempFile(t, `
700-
apiVersion: apiserver.config.k8s.io/v1alpha1
700+
apiVersion: apiserver.config.k8s.io/v1
701701
kind: AuthenticationConfiguration
702702
jwt:
703703
- issuer:
@@ -729,7 +729,7 @@ jwt:
729729
},
730730
},
731731
AuthenticationConfigData: `
732-
apiVersion: apiserver.config.k8s.io/v1alpha1
732+
apiVersion: apiserver.config.k8s.io/v1
733733
kind: AuthenticationConfiguration
734734
jwt:
735735
- issuer:
@@ -982,7 +982,7 @@ func TestToAuthenticationConfig_OIDC(t *testing.T) {
982982
name: "basic authentication configuration",
983983
args: []string{
984984
"--authentication-config=" + writeTempFile(t, `
985-
apiVersion: apiserver.config.k8s.io/v1alpha1
985+
apiVersion: apiserver.config.k8s.io/v1
986986
kind: AuthenticationConfiguration
987987
jwt:
988988
- issuer:
@@ -1013,7 +1013,7 @@ jwt:
10131013
},
10141014
},
10151015
AuthenticationConfigData: `
1016-
apiVersion: apiserver.config.k8s.io/v1alpha1
1016+
apiVersion: apiserver.config.k8s.io/v1
10171017
kind: AuthenticationConfiguration
10181018
jwt:
10191019
- issuer:
@@ -1238,7 +1238,7 @@ func TestLoadAuthenticationConfig(t *testing.T) {
12381238
file: func() string {
12391239
return writeTempFile(t,
12401240
`{
1241-
"apiVersion":"apiserver.config.k8s.io/v1alpha1",
1241+
"apiVersion":"apiserver.config.k8s.io/v1",
12421242
"kind":"AuthenticationConfiguration",
12431243
"jwt":[{"issuer":{"url": "https://test-issuer"}}]}`)
12441244
},
@@ -1251,7 +1251,7 @@ func TestLoadAuthenticationConfig(t *testing.T) {
12511251
},
12521252
},
12531253
expectedContentData: `{
1254-
"apiVersion":"apiserver.config.k8s.io/v1alpha1",
1254+
"apiVersion":"apiserver.config.k8s.io/v1",
12551255
"kind":"AuthenticationConfiguration",
12561256
"jwt":[{"issuer":{"url": "https://test-issuer"}}]}`,
12571257
},
@@ -1276,7 +1276,7 @@ func TestLoadAuthenticationConfig(t *testing.T) {
12761276
},
12771277
{
12781278
name: "missing kind",
1279-
file: func() string { return writeTempFile(t, `{"apiVersion":"apiserver.config.k8s.io/v1alpha1"}`) },
1279+
file: func() string { return writeTempFile(t, `{"apiVersion":"apiserver.config.k8s.io/v1"}`) },
12801280
expectErr: `'Kind' is missing`,
12811281
},
12821282
{
@@ -1296,25 +1296,25 @@ func TestLoadAuthenticationConfig(t *testing.T) {
12961296
{
12971297
name: "unknown kind",
12981298
file: func() string {
1299-
return writeTempFile(t, `{"apiVersion":"apiserver.config.k8s.io/v1alpha1","kind":"SomeConfiguration"}`)
1299+
return writeTempFile(t, `{"apiVersion":"apiserver.config.k8s.io/v1","kind":"SomeConfiguration"}`)
13001300
},
13011301
expectErr: `SomeConfiguration`,
13021302
},
13031303
{
13041304
name: "unknown field",
13051305
file: func() string {
13061306
return writeTempFile(t, `{
1307-
"apiVersion":"apiserver.config.k8s.io/v1alpha1",
1307+
"apiVersion":"apiserver.config.k8s.io/v1",
13081308
"kind":"AuthenticationConfiguration",
13091309
"jwt1":[{"issuer":{"url": "https://test-issuer"}}]}`)
13101310
},
13111311
expectErr: `unknown field "jwt1"`,
13121312
},
13131313
{
1314-
name: "v1alpha1 - json",
1314+
name: "v1 - json",
13151315
file: func() string {
13161316
return writeTempFile(t, `{
1317-
"apiVersion":"apiserver.config.k8s.io/v1alpha1",
1317+
"apiVersion":"apiserver.config.k8s.io/v1",
13181318
"kind":"AuthenticationConfiguration",
13191319
"jwt":[{"issuer":{"url": "https://test-issuer"}}]}`)
13201320
},
@@ -1328,15 +1328,15 @@ func TestLoadAuthenticationConfig(t *testing.T) {
13281328
},
13291329
},
13301330
expectedContentData: `{
1331-
"apiVersion":"apiserver.config.k8s.io/v1alpha1",
1331+
"apiVersion":"apiserver.config.k8s.io/v1",
13321332
"kind":"AuthenticationConfiguration",
13331333
"jwt":[{"issuer":{"url": "https://test-issuer"}}]}`,
13341334
},
13351335
{
1336-
name: "v1alpha1 - yaml",
1336+
name: "v1 - yaml",
13371337
file: func() string {
13381338
return writeTempFile(t, `
1339-
apiVersion: apiserver.config.k8s.io/v1alpha1
1339+
apiVersion: apiserver.config.k8s.io/v1
13401340
kind: AuthenticationConfiguration
13411341
jwt:
13421342
- issuer:
@@ -1363,7 +1363,7 @@ jwt:
13631363
},
13641364
},
13651365
expectedContentData: `
1366-
apiVersion: apiserver.config.k8s.io/v1alpha1
1366+
apiVersion: apiserver.config.k8s.io/v1
13671367
kind: AuthenticationConfiguration
13681368
jwt:
13691369
- issuer:
@@ -1378,19 +1378,19 @@ jwt:
13781378
name: "v1alpha1 - no jwt",
13791379
file: func() string {
13801380
return writeTempFile(t, `{
1381-
"apiVersion":"apiserver.config.k8s.io/v1alpha1",
1381+
"apiVersion":"apiserver.config.k8s.io/v1",
13821382
"kind":"AuthenticationConfiguration"}`)
13831383
},
13841384
expectedConfig: &apiserver.AuthenticationConfiguration{},
13851385
expectedContentData: `{
1386-
"apiVersion":"apiserver.config.k8s.io/v1alpha1",
1386+
"apiVersion":"apiserver.config.k8s.io/v1",
13871387
"kind":"AuthenticationConfiguration"}`,
13881388
},
13891389
{
1390-
name: "v1beta1 - json",
1390+
name: "v1 - json",
13911391
file: func() string {
13921392
return writeTempFile(t, `{
1393-
"apiVersion":"apiserver.config.k8s.io/v1beta1",
1393+
"apiVersion":"apiserver.config.k8s.io/v1",
13941394
"kind":"AuthenticationConfiguration",
13951395
"jwt":[{"issuer":{"url": "https://test-issuer"}}]}`)
13961396
},
@@ -1404,15 +1404,15 @@ jwt:
14041404
},
14051405
},
14061406
expectedContentData: `{
1407-
"apiVersion":"apiserver.config.k8s.io/v1beta1",
1407+
"apiVersion":"apiserver.config.k8s.io/v1",
14081408
"kind":"AuthenticationConfiguration",
14091409
"jwt":[{"issuer":{"url": "https://test-issuer"}}]}`,
14101410
},
14111411
{
1412-
name: "v1beta1 - yaml",
1412+
name: "v1 - yaml",
14131413
file: func() string {
14141414
return writeTempFile(t, `
1415-
apiVersion: apiserver.config.k8s.io/v1beta1
1415+
apiVersion: apiserver.config.k8s.io/v1
14161416
kind: AuthenticationConfiguration
14171417
jwt:
14181418
- issuer:
@@ -1439,7 +1439,7 @@ jwt:
14391439
},
14401440
},
14411441
expectedContentData: `
1442-
apiVersion: apiserver.config.k8s.io/v1beta1
1442+
apiVersion: apiserver.config.k8s.io/v1
14431443
kind: AuthenticationConfiguration
14441444
jwt:
14451445
- issuer:
@@ -1451,15 +1451,15 @@ jwt:
14511451
`,
14521452
},
14531453
{
1454-
name: "v1beta1 - no jwt",
1454+
name: "v1 - no jwt",
14551455
file: func() string {
14561456
return writeTempFile(t, `{
1457-
"apiVersion":"apiserver.config.k8s.io/v1beta1",
1457+
"apiVersion":"apiserver.config.k8s.io/v1",
14581458
"kind":"AuthenticationConfiguration"}`)
14591459
},
14601460
expectedConfig: &apiserver.AuthenticationConfiguration{},
14611461
expectedContentData: `{
1462-
"apiVersion":"apiserver.config.k8s.io/v1beta1",
1462+
"apiVersion":"apiserver.config.k8s.io/v1",
14631463
"kind":"AuthenticationConfiguration"}`,
14641464
},
14651465
}

‎staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1/register.go

Copy file name to clipboardExpand all lines: staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1/register.go
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ func init() {
4747
func addKnownTypes(scheme *runtime.Scheme) error {
4848
scheme.AddKnownTypes(SchemeGroupVersion,
4949
&AdmissionConfiguration{},
50+
&AuthenticationConfiguration{},
5051
&AuthorizationConfiguration{},
5152
&EncryptionConfiguration{},
5253
)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.