mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #104803 from bobbypage/runtimeclass-skip
Skip runtimeclass test unless provider GCE
This commit is contained in:
		@@ -35,6 +35,7 @@ import (
 | 
				
			|||||||
	e2eevents "k8s.io/kubernetes/test/e2e/framework/events"
 | 
						e2eevents "k8s.io/kubernetes/test/e2e/framework/events"
 | 
				
			||||||
	e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 | 
						e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 | 
				
			||||||
	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 | 
						e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 | 
				
			||||||
 | 
						e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/onsi/ginkgo"
 | 
						"github.com/onsi/ginkgo"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
@@ -71,6 +72,10 @@ var _ = SIGDescribe("RuntimeClass", func() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	// This test requires that the PreconfiguredRuntimeHandler has already been set up on nodes.
 | 
						// This test requires that the PreconfiguredRuntimeHandler has already been set up on nodes.
 | 
				
			||||||
	ginkgo.It("should run a Pod requesting a RuntimeClass with a configured handler [NodeFeature:RuntimeHandler]", func() {
 | 
						ginkgo.It("should run a Pod requesting a RuntimeClass with a configured handler [NodeFeature:RuntimeHandler]", func() {
 | 
				
			||||||
 | 
							// Requires special setup of test-handler which is only done in GCE kube-up environment
 | 
				
			||||||
 | 
							// see https://github.com/kubernetes/kubernetes/blob/eb729620c522753bc7ae61fc2c7b7ea19d4aad2f/cluster/gce/gci/configure-helper.sh#L3069-L3076
 | 
				
			||||||
 | 
							e2eskipper.SkipUnlessProviderIs("gce")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// The built-in docker runtime does not support configuring runtime handlers.
 | 
							// The built-in docker runtime does not support configuring runtime handlers.
 | 
				
			||||||
		handler := e2enode.PreconfiguredRuntimeClassHandler(framework.TestContext.ContainerRuntime)
 | 
							handler := e2enode.PreconfiguredRuntimeClassHandler(framework.TestContext.ContainerRuntime)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -29,6 +29,7 @@ import (
 | 
				
			|||||||
	"k8s.io/kubernetes/test/e2e/framework"
 | 
						"k8s.io/kubernetes/test/e2e/framework"
 | 
				
			||||||
	e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 | 
						e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 | 
				
			||||||
	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 | 
						e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 | 
				
			||||||
 | 
						e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
 | 
				
			||||||
	"k8s.io/kubernetes/test/e2e/scheduling"
 | 
						"k8s.io/kubernetes/test/e2e/scheduling"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/onsi/ginkgo"
 | 
						"github.com/onsi/ginkgo"
 | 
				
			||||||
@@ -123,6 +124,10 @@ var _ = SIGDescribe("RuntimeClass", func() {
 | 
				
			|||||||
	})
 | 
						})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ginkgo.It("should run a Pod requesting a RuntimeClass with scheduling without taints ", func() {
 | 
						ginkgo.It("should run a Pod requesting a RuntimeClass with scheduling without taints ", func() {
 | 
				
			||||||
 | 
							// Requires special setup of test-handler which is only done in GCE kube-up environment
 | 
				
			||||||
 | 
							// see https://github.com/kubernetes/kubernetes/blob/eb729620c522753bc7ae61fc2c7b7ea19d4aad2f/cluster/gce/gci/configure-helper.sh#L3069-L3076
 | 
				
			||||||
 | 
							e2eskipper.SkipUnlessProviderIs("gce")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		labelFooName := "foo-" + string(uuid.NewUUID())
 | 
							labelFooName := "foo-" + string(uuid.NewUUID())
 | 
				
			||||||
		labelFizzName := "fizz-" + string(uuid.NewUUID())
 | 
							labelFizzName := "fizz-" + string(uuid.NewUUID())
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user