github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54455 from guangxuli/fix-network-e2e-test

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 54455, 54431). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Migrate cluster dns test to sig network

**What this PR does / why we need it**:

Just migrate dns relevant e2e test files to sig network. 

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

Ref Umbrella issue #49161

**Special notes for your reviewer**:

**Release note**:
```release-note
none
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-26 15:10:37 -07:00 committed by GitHub
commit b8d0f4f2d2
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/BUILD
View File

@ -39,7 +39,6 @@ go_library(
srcs = [
"e2e.go",
"events.go",
"example_cluster_dns.go",
"examples.go",
"gke_local_ssd.go",
"gke_node_pools.go",

11
test/e2e/examples.go
View File

@ -598,17 +598,6 @@ func makeHttpRequestToService(c clientset.Interface, ns, service, path string, t
return string(result), err
}
// pass enough context with the 'old' parameter so that it replaces what your really intended.
func prepareResourceWithReplacedString(inputFile, old, new string) string {
f, err := os.Open(inputFile)
Expect(err).NotTo(HaveOccurred())
defer f.Close()
data, err := ioutil.ReadAll(f)
Expect(err).NotTo(HaveOccurred())
podYaml := strings.Replace(string(data), old, new, 1)
return podYaml
}
func createFileForGoBinData(gobindataPath, outputFilename string) error {
data := generated.ReadOrDie(gobindataPath)
if len(data) == 0 {

1
test/e2e/network/BUILD
View File

@ -12,6 +12,7 @@ go_library(
"dns_common.go",
"dns_configmap.go",
"doc.go",
"example_cluster_dns.go",
"firewall.go",
"framework.go",
"ingress.go",

18
test/e2e/example_cluster_dns.go → test/e2e/network/example_cluster_dns.go
View File

@ -14,11 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e
package network
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
"time"
"k8s.io/api/core/v1"
@ -44,7 +47,7 @@ try:
except:
print 'err'`
var _ = framework.KubeDescribe("ClusterDns [Feature:Example]", func() {
var _ = SIGDescribe("ClusterDns [Feature:Example]", func() {
f := framework.NewDefaultFramework("cluster-dns")
var c clientset.Interface
@ -156,3 +159,14 @@ var _ = framework.KubeDescribe("ClusterDns [Feature:Example]", func() {
func getNsCmdFlag(ns *v1.Namespace) string {
return fmt.Sprintf("--namespace=%v", ns.Name)
}
// pass enough context with the 'old' parameter so that it replaces what your really intended.
func prepareResourceWithReplacedString(inputFile, old, new string) string {
f, err := os.Open(inputFile)
Expect(err).NotTo(HaveOccurred())
defer f.Close()
data, err := ioutil.ReadAll(f)
Expect(err).NotTo(HaveOccurred())
podYaml := strings.Replace(string(data), old, new, 1)
return podYaml
}