From d961b9dea5d8ed828b0028713b84a9b0f1f60404 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 27 May 2020 16:22:43 +0200 Subject: [PATCH] connectivity-check: Do not perform hostport in standard check Due to HostPort not being enabled by default, do not perform the check by default. Require the "connectivity-check-hostport.yaml" to be deployed. Fixes: #11563 Signed-off-by: Thomas Graf --- .../k8s-install-connectivity-test.rst | 10 - .../kubernetes/connectivity-check/Makefile | 27 +- .../kubernetes/connectivity-check/README.md | 8 - .../connectivity-check-hostport.yaml | 679 ++++++++++++++++++ .../connectivity-check.yaml | 78 -- test/k8sT/Conformance.go | 2 +- 6 files changed, 700 insertions(+), 104 deletions(-) create mode 100644 examples/kubernetes/connectivity-check/connectivity-check-hostport.yaml diff --git a/Documentation/gettingstarted/k8s-install-connectivity-test.rst b/Documentation/gettingstarted/k8s-install-connectivity-test.rst index 178405e5dd1b..0aeeb57f21ba 100644 --- a/Documentation/gettingstarted/k8s-install-connectivity-test.rst +++ b/Documentation/gettingstarted/k8s-install-connectivity-test.rst @@ -26,17 +26,7 @@ indicates success or failure of the test: pod-to-a-external-1111-7ff666fd8-v5kqb 1/1 Running 0 4m48s pod-to-a-l3-denied-cnp-64c6c75c5d-xmqhw 1/1 Running 0 4m50s pod-to-b-intra-node-845f955cdc-5nfrt 1/1 Running 0 4m49s - pod-to-b-intra-node-hostport-6549fc5b88-ngcl5 0/1 Running 4 4m49s pod-to-b-multi-node-clusterip-666594b445-bsn4j 1/1 Running 0 4m49s pod-to-b-multi-node-headless-746f84dff5-prk4w 1/1 Running 0 4m49s - pod-to-b-multi-node-hostport-795964f8c8-79bxp 0/1 Running 4 4m49s pod-to-b-multi-node-nodeport-7cb9c6cb8b-ksm4h 1/1 Running 0 4m49s pod-to-external-fqdn-allow-google-cnp-b7b6bcdcb-tg9dh 1/1 Running 0 4m48s - -.. note:: - - Depending on the kernel version you are running on, the HostPort feature may - not be enabled by default. If so, the two HostPort related pods will remain - in not-ready state and restart. If you are running on Linux kernel < 4.19, - and want to use HostPort, follow the instructions in - :ref:`k8s_install_portmap` to enable it. diff --git a/examples/kubernetes/connectivity-check/Makefile b/examples/kubernetes/connectivity-check/Makefile index 48340af61f00..e43ee960a14c 100644 --- a/examples/kubernetes/connectivity-check/Makefile +++ b/examples/kubernetes/connectivity-check/Makefile @@ -1,13 +1,26 @@ # Copyright 2017-2020 Authors of Cilium # SPDX-License-Identifier: Apache-2.0 +# +DEFAULT_OUT := connectivity-check.yaml +HOSTPORT_OUT := connectivity-check-hostport.yaml -OUT := connectivity-check.yaml SRC := $(wildcard *.yaml) -SRC := $(filter-out $(OUT), $(SRC)) +HOSTPORT_SRC := $(filter-out $(DEFAULT_OUT) $(HOSTPORT_OUT), $(SRC)) +DEFAULT_SRC := $(filter-out $(wildcard *-hostport.yaml),$(HOSTPORT_SRC)) -all: $(SRC) - @echo '# Automatically generated by Makefile. DO NOT EDIT' > $(OUT) - for FILE in $(SRC); do \ - cat $$FILE >> $(OUT); \ - echo "---" >> $(OUT); \ + +all: $(DEFAULT_OUT) $(HOSTPORT_OUT) + +$(DEFAULT_OUT): $(DEFAULT_SRC) + @echo '# Automatically generated by Makefile. DO NOT EDIT' > $(DEFAULT_OUT) + for FILE in $(DEFAULT_SRC); do \ + cat $$FILE >> $(DEFAULT_OUT); \ + echo "---" >> $(DEFAULT_OUT); \ + done + +$(HOSTPORT_OUT): $(HOSTPORT_SRC) + @echo '# Automatically generated by Makefile. DO NOT EDIT' > $(HOSTPORT_OUT) + for FILE in $(HOSTPORT_SRC); do \ + cat $$FILE >> $(HOSTPORT_OUT); \ + echo "---" >> $(HOSTPORT_OUT); \ done diff --git a/examples/kubernetes/connectivity-check/README.md b/examples/kubernetes/connectivity-check/README.md index b0ff193e3854..ab7a9bfa240f 100644 --- a/examples/kubernetes/connectivity-check/README.md +++ b/examples/kubernetes/connectivity-check/README.md @@ -2,11 +2,3 @@ Set of deployments that will perform a series of connectivity checks via liveness and readiness checks. An unhealthy/unready pod indicates a problem. - -## Note: HostPort test - -Cilium does not enable HostPort by default. Therefore you will have the -following two pods remain unready unless you enable HostPort via chaining: - - pod-to-b-intra-node-hostport-6549fc5b88-ngcl5 0/1 Running 3 3m31s - pod-to-b-multi-node-hostport-795964f8c8-79bxp 0/1 Running 3 3m31s diff --git a/examples/kubernetes/connectivity-check/connectivity-check-hostport.yaml b/examples/kubernetes/connectivity-check/connectivity-check-hostport.yaml new file mode 100644 index 000000000000..92ccf03db72c --- /dev/null +++ b/examples/kubernetes/connectivity-check/connectivity-check-hostport.yaml @@ -0,0 +1,679 @@ +# Automatically generated by Makefile. DO NOT EDIT +apiVersion: v1 +kind: Service +metadata: + name: echo-a +spec: + type: ClusterIP + ports: + - port: 80 + selector: + name: echo-a +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: echo-a +spec: + selector: + matchLabels: + name: echo-a + replicas: 1 + template: + metadata: + labels: + name: echo-a + spec: + containers: + - name: echo-container + image: docker.io/cilium/json-mock:1.0 + imagePullPolicy: IfNotPresent + readinessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "localhost"] +--- +apiVersion: v1 +kind: Service +metadata: + name: echo-b +spec: + type: NodePort + ports: + - port: 80 + nodePort: 31313 + selector: + name: echo-b +--- +apiVersion: v1 +kind: Service +metadata: + name: echo-b-headless +spec: + type: ClusterIP + clusterIP: None + ports: + - port: 80 + selector: + name: echo-b +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: echo-b +spec: + selector: + matchLabels: + name: echo-b + replicas: 1 + template: + metadata: + labels: + name: echo-b + spec: + containers: + - name: echo-container + image: docker.io/cilium/json-mock:1.0 + imagePullPolicy: IfNotPresent + ports: + - containerPort: 80 + hostPort: 40000 + readinessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "localhost"] +--- +# The echo-b-host pod runs in host networking on the same node as echo-b. +apiVersion: apps/v1 +kind: Deployment +metadata: + name: echo-b-host +spec: + selector: + matchLabels: + name: echo-b-host + replicas: 1 + template: + metadata: + labels: + name: echo-b-host + spec: + hostNetwork: true + containers: + - name: echo-container + image: docker.io/cilium/json-mock:1.0 + imagePullPolicy: IfNotPresent + env: + - name: PORT + value: "41000" + readinessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "localhost:41000"] + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: "kubernetes.io/hostname" +--- +# Connecting to "echo-b-host-headless" will provide service discovery to the +# node IP on which echo-b* is running +apiVersion: v1 +kind: Service +metadata: + name: echo-b-host-headless +spec: + type: ClusterIP + clusterIP: None + selector: + name: echo-b-host +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: host-to-b-multi-node-clusterip +spec: + selector: + matchLabels: + name: host-to-b-multi-node-clusterip + replicas: 1 + template: + metadata: + labels: + name: host-to-b-multi-node-clusterip + spec: + hostNetwork: true + dnsPolicy: ClusterFirstWithHostNet + containers: + - name: host-to-b-multi-node-container + imagePullPolicy: IfNotPresent + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + livenessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "echo-b"] + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: "kubernetes.io/hostname" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: host-to-b-multi-node-headless +spec: + selector: + matchLabels: + name: host-to-b-multi-node-headless + replicas: 1 + template: + metadata: + labels: + name: host-to-b-multi-node-headless + spec: + hostNetwork: true + dnsPolicy: ClusterFirstWithHostNet + containers: + - name: host-to-b-multi-node-container + imagePullPolicy: IfNotPresent + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + livenessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-headless"] + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: "kubernetes.io/hostname" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-a-allowed-cnp +spec: + selector: + matchLabels: + name: pod-to-a-allowed-cnp + replicas: 1 + template: + metadata: + labels: + name: pod-to-a-allowed-cnp + spec: + containers: + - name: pod-to-a-allowed-cnp-container + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "echo-a"] + readinessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "echo-a"] +--- +apiVersion: "cilium.io/v2" +kind: CiliumNetworkPolicy +metadata: + name: "pod-to-a-allowed-cnp" +spec: + endpointSelector: + matchLabels: + name: pod-to-a-allowed-cnp + egress: + - toEndpoints: + - matchLabels: + name: echo-a + toPorts: + - ports: + - port: "80" + protocol: TCP + - toEndpoints: + - matchLabels: + k8s:io.kubernetes.pod.namespace: kube-system + k8s:k8s-app: kube-dns + toPorts: + - ports: + - port: "53" + protocol: UDP + - toEndpoints: + - matchLabels: + k8s:io.kubernetes.pod.namespace: openshift-dns + k8s:dns.operator.openshift.io/daemonset-dns: default + toPorts: + - ports: + - port: "5353" + protocol: UDP +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-a-l3-denied-cnp +spec: + selector: + matchLabels: + name: pod-to-a-l3-denied-cnp + replicas: 1 + template: + metadata: + labels: + name: pod-to-a-l3-denied-cnp + spec: + containers: + - name: pod-to-a-l3-denied-cnp-container + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + imagePullPolicy: IfNotPresent + livenessProbe: + timeoutSeconds: 7 + exec: + command: ["ash", "-c", "! curl -sS --fail --connect-timeout 5 -o /dev/null echo-a"] + readinessProbe: + timeoutSeconds: 7 + exec: + command: ["ash", "-c", "! curl -sS --fail --connect-timeout 5 -o /dev/null echo-a"] +--- +apiVersion: "cilium.io/v2" +kind: CiliumNetworkPolicy +metadata: + name: "pod-to-a-l3-denied-cnp" +spec: + endpointSelector: + matchLabels: + name: pod-to-a-l3-denied-cnp + egress: + - toEndpoints: + - matchLabels: + k8s:io.kubernetes.pod.namespace: kube-system + k8s:k8s-app: kube-dns + toPorts: + - ports: + - port: "53" + protocol: UDP + - toEndpoints: + - matchLabels: + k8s:io.kubernetes.pod.namespace: openshift-dns + k8s:dns.operator.openshift.io/daemonset-dns: default + toPorts: + - ports: + - port: "5353" + protocol: UDP +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-a +spec: + selector: + matchLabels: + name: pod-to-a + replicas: 1 + template: + metadata: + labels: + name: pod-to-a + spec: + containers: + - name: pod-to-a-container + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "echo-a"] +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-b-intra-node-hostport +spec: + replicas: 1 + selector: + matchLabels: + name: pod-to-b-intra-node-hostport + template: + metadata: + labels: + name: pod-to-b-intra-node-hostport + spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: kubernetes.io/hostname + containers: + - command: + - /bin/ash + - -c + - sleep 1000000000 + image: docker.io/byrnedo/alpine-curl:0.1.8 + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:40000" ] + readinessProbe: + exec: + command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:40000" ] + name: pod-to-b-intra-node-hostport +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-b-intra-node-nodeport +spec: + replicas: 1 + selector: + matchLabels: + name: pod-to-b-intra-node-nodeport + template: + metadata: + labels: + name: pod-to-b-intra-node-nodeport + spec: + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: kubernetes.io/hostname + containers: + - command: + - /bin/ash + - -c + - sleep 1000000000 + image: docker.io/byrnedo/alpine-curl:0.1.8 + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:31313" ] + readinessProbe: + exec: + command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:31313" ] + name: pod-to-b-intra-node-hostport +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-b-intra-node +spec: + selector: + matchLabels: + name: pod-to-b-intra-node + replicas: 1 + template: + metadata: + labels: + name: pod-to-b-intra-node + spec: + containers: + - name: pod-to-b-intra-node-container + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "echo-b"] + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: "kubernetes.io/hostname" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-b-multi-node-clusterip +spec: + selector: + matchLabels: + name: pod-to-b-multi-node-clusterip + replicas: 1 + template: + metadata: + labels: + name: pod-to-b-multi-node-clusterip + spec: + containers: + - name: pod-to-b-multi-node-container + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "echo-b"] + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: "kubernetes.io/hostname" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-b-multi-node-headless +spec: + selector: + matchLabels: + name: pod-to-b-multi-node-headless + replicas: 1 + template: + metadata: + labels: + name: pod-to-b-multi-node-headless + spec: + containers: + - name: pod-to-b-multi-node-container + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: ["curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-headless"] + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: "kubernetes.io/hostname" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-b-multi-node-hostport +spec: + replicas: 1 + selector: + matchLabels: + name: pod-to-b-multi-node-hostport + template: + metadata: + labels: + name: pod-to-b-multi-node-hostport + spec: + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: kubernetes.io/hostname + containers: + - command: + - /bin/ash + - -c + - sleep 1000000000 + image: docker.io/byrnedo/alpine-curl:0.1.8 + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:40000" ] + readinessProbe: + exec: + command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:40000" ] + name: pod-to-b-multi-node-hostport +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-b-multi-node-nodeport +spec: + replicas: 1 + selector: + matchLabels: + name: pod-to-b-multi-node-nodeport + template: + metadata: + labels: + name: pod-to-b-multi-node-nodeport + spec: + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - echo-b + topologyKey: kubernetes.io/hostname + containers: + - command: + - /bin/ash + - -c + - sleep 1000000000 + image: docker.io/byrnedo/alpine-curl:0.1.8 + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:31313" ] + readinessProbe: + exec: + command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:31313" ] + name: pod-to-b-multi-node-nodeport +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-a-external-1111 +spec: + selector: + matchLabels: + name: pod-to-a-external-1111 + replicas: 1 + template: + metadata: + labels: + name: pod-to-a-external-1111 + spec: + containers: + - name: pod-to-a-external-1111-container + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: ["curl", "-sS", "--fail", "--connect-timeout", "5", "-o", "/dev/null", "1.1.1.1"] + readinessProbe: + exec: + command: ["curl", "-sS", "--fail", "--connect-timeout", "5", "-o", "/dev/null", "1.1.1.1"] +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: pod-to-external-fqdn-allow-google-cnp +spec: + selector: + matchLabels: + name: pod-to-external-fqdn-allow-google-cnp + replicas: 1 + template: + metadata: + labels: + name: pod-to-external-fqdn-allow-google-cnp + spec: + containers: + - name: pod-to-external-fqdn-allow-google-cnp-container + image: docker.io/byrnedo/alpine-curl:0.1.8 + command: ["/bin/ash", "-c", "sleep 1000000000"] + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: ["curl", "-sS", "--fail", "--connect-timeout", "5", "-o", "/dev/null", "www.google.com"] + readinessProbe: + exec: + command: ["curl", "-sS", "--fail", "--connect-timeout", "5", "-o", "/dev/null", "www.google.com"] +--- +apiVersion: "cilium.io/v2" +kind: CiliumNetworkPolicy +metadata: + name: "pod-to-external-fqdn-allow-google-cnp" +spec: + endpointSelector: + matchLabels: + name: pod-to-external-fqdn-allow-google-cnp + egress: + - toEndpoints: + - matchLabels: + "k8s:io.kubernetes.pod.namespace": kube-system + "k8s:k8s-app": kube-dns + toPorts: + - ports: + - port: "53" + protocol: ANY + rules: + dns: + - matchPattern: "*" + - toEndpoints: + - matchLabels: + k8s:io.kubernetes.pod.namespace: openshift-dns + k8s:dns.operator.openshift.io/daemonset-dns: default + toPorts: + - ports: + - port: "5353" + protocol: UDP + rules: + dns: + - matchPattern: "*" + - toFQDNs: + - matchPattern: "*.google.com" +--- diff --git a/examples/kubernetes/connectivity-check/connectivity-check.yaml b/examples/kubernetes/connectivity-check/connectivity-check.yaml index 92ccf03db72c..d572898fa112 100644 --- a/examples/kubernetes/connectivity-check/connectivity-check.yaml +++ b/examples/kubernetes/connectivity-check/connectivity-check.yaml @@ -338,45 +338,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: pod-to-b-intra-node-hostport -spec: - replicas: 1 - selector: - matchLabels: - name: pod-to-b-intra-node-hostport - template: - metadata: - labels: - name: pod-to-b-intra-node-hostport - spec: - affinity: - podAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: name - operator: In - values: - - echo-b - topologyKey: kubernetes.io/hostname - containers: - - command: - - /bin/ash - - -c - - sleep 1000000000 - image: docker.io/byrnedo/alpine-curl:0.1.8 - imagePullPolicy: IfNotPresent - livenessProbe: - exec: - command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:40000" ] - readinessProbe: - exec: - command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:40000" ] - name: pod-to-b-intra-node-hostport ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: pod-to-b-intra-node-nodeport spec: @@ -515,45 +476,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: pod-to-b-multi-node-hostport -spec: - replicas: 1 - selector: - matchLabels: - name: pod-to-b-multi-node-hostport - template: - metadata: - labels: - name: pod-to-b-multi-node-hostport - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: name - operator: In - values: - - echo-b - topologyKey: kubernetes.io/hostname - containers: - - command: - - /bin/ash - - -c - - sleep 1000000000 - image: docker.io/byrnedo/alpine-curl:0.1.8 - imagePullPolicy: IfNotPresent - livenessProbe: - exec: - command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:40000" ] - readinessProbe: - exec: - command: [ "curl", "-sS", "--fail", "-o", "/dev/null", "echo-b-host-headless:40000" ] - name: pod-to-b-multi-node-hostport ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: pod-to-b-multi-node-nodeport spec: diff --git a/test/k8sT/Conformance.go b/test/k8sT/Conformance.go index 2fe5177b8785..692a7056e578 100644 --- a/test/k8sT/Conformance.go +++ b/test/k8sT/Conformance.go @@ -28,7 +28,7 @@ var _ = Describe("K8sConformance", func() { BeforeAll(func() { kubectl = helpers.CreateKubectl(helpers.K8s1VMName(), logger) - connectivityCheckYaml = kubectl.GetFilePath("../examples/kubernetes/connectivity-check/connectivity-check.yaml") + connectivityCheckYaml = kubectl.GetFilePath("../examples/kubernetes/connectivity-check/connectivity-check-hostport.yaml") ciliumFilename = helpers.TimestampFilename("cilium.yaml") })