Merge pull request #31245 from deads2k/api-02

pkg/genericapiserver/genericapiserver_test.go

@@ -76,19 +76,11 @@ func TestNew(t *testing.T) {
 	defer etcdserver.Terminate(t)
 
 	// Verify many of the variables match their config counterparts
-	assert.Equal(s.enableLogsSupport, config.EnableLogsSupport)
-	assert.Equal(s.enableUISupport, config.EnableUISupport)
 	assert.Equal(s.enableSwaggerSupport, config.EnableSwaggerSupport)
-	assert.Equal(s.enableSwaggerUI, config.EnableSwaggerUI)
-	assert.Equal(s.enableProfiling, config.EnableProfiling)
-	assert.Equal(s.APIPrefix, config.APIPrefix)
-	assert.Equal(s.APIGroupPrefix, config.APIGroupPrefix)
-	assert.Equal(s.corsAllowedOriginList, config.CorsAllowedOriginList)
-	assert.Equal(s.authenticator, config.Authenticator)
-	assert.Equal(s.authorizer, config.Authorizer)
-	assert.Equal(s.AdmissionControl, config.AdmissionControl)
-	assert.Equal(s.RequestContextMapper, config.RequestContextMapper)
-	assert.Equal(s.cacheTimeout, config.CacheTimeout)
+	assert.Equal(s.legacyAPIPrefix, config.APIPrefix)
+	assert.Equal(s.apiPrefix, config.APIGroupPrefix)
+	assert.Equal(s.admissionControl, config.AdmissionControl)
+	assert.Equal(s.RequestContextMapper(), config.RequestContextMapper)
 	assert.Equal(s.ExternalAddress, config.ExternalHost)
 	assert.Equal(s.ClusterIP, config.PublicAddress)
 	assert.Equal(s.PublicReadWritePort, config.ReadWritePort)

pkg/master/master.go

@@ -760,9 +760,9 @@ func (m *Master) thirdpartyapi(group, kind, version, pluralResource string) *api
 		Serializer:     thirdpartyresourcedata.NewNegotiatedSerializer(api.Codecs, kind, externalVersion, internalVersion),
 		ParameterCodec: thirdpartyresourcedata.NewThirdPartyParameterCodec(api.ParameterCodec),
 
-		Context: m.RequestContextMapper,
+		Context: m.RequestContextMapper(),
 
-		MinRequestTimeout: m.MinRequestTimeout,
+		MinRequestTimeout: m.MinRequestTimeout(),
 
 		ResourceLister: dynamicLister{m, makeThirdPartyPath(group)},
 	}

pkg/master/master_test.go

@@ -173,9 +173,7 @@ func TestNew(t *testing.T) {
 	// Verify many of the variables match their config counterparts
 	assert.Equal(master.enableCoreControllers, config.EnableCoreControllers)
 	assert.Equal(master.tunneler, config.Tunneler)
-	assert.Equal(master.APIPrefix, config.APIPrefix)
-	assert.Equal(master.APIGroupPrefix, config.APIGroupPrefix)
-	assert.Equal(master.RequestContextMapper, config.RequestContextMapper)
+	assert.Equal(master.RequestContextMapper(), config.RequestContextMapper)
 	assert.Equal(master.MasterCount, config.MasterCount)
 	assert.Equal(master.ClusterIP, config.PublicAddress)
 	assert.Equal(master.PublicReadWritePort, config.ReadWritePort)