Merge pull request #42664 from nikhiljindal/disableAPIs

Automatic merge from submit-queue (batch tested with PRs 42664, 42687)

federation: Disable half baked APIs from federation

Fixes https://github.com/kubernetes/kubernetes/issues/42587
Disables batch and autoscaling APIs as we didnt get the controllers merged for them in time.

This is a fall back option in case https://github.com/kubernetes/kubernetes/pull/42225 is not approved by the release team.

We need one of this or https://github.com/kubernetes/kubernetes/pull/42225 to be merged in 1.6.

cc @kubernetes/sig-federation-bugs

federation/apis/swagger-spec/extensions_v1beta1.json

@@ -4825,6 +4825,10 @@
      "portworxVolume": {
       "$ref": "v1.PortworxVolumeSource",
       "description": "PortworxVolume represents a portworx volume attached and mounted on kubelets host machine"
+     },
+     "scaleIO": {
+      "$ref": "v1.ScaleIOVolumeSource",
+      "description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
      }
     }
    },
@@ -5605,6 +5609,57 @@
      }
     }
    },
+   "v1.ScaleIOVolumeSource": {
+    "id": "v1.ScaleIOVolumeSource",
+    "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
+    "required": [
+     "gateway",
+     "system",
+     "secretRef"
+    ],
+    "properties": {
+     "gateway": {
+      "type": "string",
+      "description": "The host address of the ScaleIO API Gateway."
+     },
+     "system": {
+      "type": "string",
+      "description": "The name of the storage system as configured in ScaleIO."
+     },
+     "secretRef": {
+      "$ref": "v1.LocalObjectReference",
+      "description": "SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail."
+     },
+     "sslEnabled": {
+      "type": "boolean",
+      "description": "Flag to enable/disable SSL communication with Gateway, default false"
+     },
+     "protectionDomain": {
+      "type": "string",
+      "description": "The name of the Protection Domain for the configured storage (defaults to \"default\")."
+     },
+     "storagePool": {
+      "type": "string",
+      "description": "The Storage Pool associated with the protection domain (defaults to \"default\")."
+     },
+     "storageMode": {
+      "type": "string",
+      "description": "Indicates whether the storage for a volume should be thick or thin (defaults to \"thin\")."
+     },
+     "volumeName": {
+      "type": "string",
+      "description": "The name of a volume already created in the ScaleIO system that is associated with this volume source."
+     },
+     "fsType": {
+      "type": "string",
+      "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."
+     },
+     "readOnly": {
+      "type": "boolean",
+      "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts."
+     }
+    }
+   },
    "v1.Container": {
     "id": "v1.Container",
     "description": "A single application container that you want to run within a pod.",

federation/apis/swagger-spec/resourceListing.json

@@ -36,30 +36,6 @@
    {
     "path": "/apis/extensions",
     "description": "get information of a group"
-   },
-   {
-    "path": "/apis/batch/v1",
-    "description": "API at /apis/batch/v1"
-   },
-   {
-    "path": "/apis/batch/v2alpha1",
-    "description": "API at /apis/batch/v2alpha1"
-   },
-   {
-    "path": "/apis/batch",
-    "description": "get information of a group"
-   },
-   {
-    "path": "/apis/autoscaling/v1",
-    "description": "API at /apis/autoscaling/v1"
-   },
-   {
-    "path": "/apis/autoscaling/v2alpha1",
-    "description": "API at /apis/autoscaling/v2alpha1"
-   },
-   {
-    "path": "/apis/autoscaling",
-    "description": "get information of a group"
    }
   ],
   "apiVersion": "",

federation/cmd/federation-apiserver/app/server.go

@@ -218,8 +218,10 @@ func Run(s *options.ServerRunOptions) error {
 	installFederationAPIs(m, genericConfig.RESTOptionsGetter)
 	installCoreAPIs(s, m, genericConfig.RESTOptionsGetter)
 	installExtensionsAPIs(m, genericConfig.RESTOptionsGetter)
-	installBatchAPIs(m, genericConfig.RESTOptionsGetter)
-	installAutoscalingAPIs(m, genericConfig.RESTOptionsGetter)
+	// Disable half-baked APIs for 1.6.
+	// TODO: Uncomment this once 1.6 is released.
+	//	installBatchAPIs(m, genericConfig.RESTOptionsGetter)
+	//	installAutoscalingAPIs(m, genericConfig.RESTOptionsGetter)
 
 	sharedInformers.Start(wait.NeverStop)
 	return m.PrepareRun().Run(wait.NeverStop)

test/integration/federation/server_test.go

@@ -44,8 +44,8 @@ var serverIP = fmt.Sprintf("http://localhost:%v", insecurePort)
 var groupVersions = []schema.GroupVersion{
 	fed_v1b1.SchemeGroupVersion,
 	ext_v1b1.SchemeGroupVersion,
-	batch_v1.SchemeGroupVersion,
-	autoscaling_v1.SchemeGroupVersion,
+	//	batch_v1.SchemeGroupVersion,
+	//	autoscaling_v1.SchemeGroupVersion,
 }
 
 func TestRun(t *testing.T) {
@@ -215,8 +215,8 @@ func testAPIResourceList(t *testing.T) {
 	testFederationResourceList(t)
 	testCoreResourceList(t)
 	testExtensionsResourceList(t)
-	testBatchResourceList(t)
-	testAutoscalingResourceList(t)
+	//	testBatchResourceList(t)
+	//	testAutoscalingResourceList(t)
 }
 
 func testFederationResourceList(t *testing.T) {