Skip to content

Commit e7b03ea

Browse files
authored
Merge pull request kubernetes#130080 from elizabeth-dev/replace-network-e2e-replicationcontrollers-2
test(network): replace RCs with Deployments in util function StartServeHostnameService
2 parents edc1fd2 + e353086 commit e7b03ea

File tree

2 files changed

+67
-69
lines changed

2 files changed

+67
-69
lines changed

test/conformance/testdata/conformance.yaml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,9 +1865,9 @@
18651865
description: 'Create a service of type "NodePort" and provide service port and protocol.
18661866
Service''s sessionAffinity is set to "ClientIP". Service creation MUST be successful
18671867
by assigning a "ClusterIP" to the service and allocating NodePort on all the nodes.
1868-
Create a Replication Controller to ensure that 3 pods are running and are targeted
1869-
by the service to serve hostname of the pod when requests are sent to the service.
1870-
Create another pod to make requests to the service. Update the service''s sessionAffinity
1868+
Create a Deployment to ensure that 3 pods are running and are targeted by the
1869+
service to serve hostname of the pod when requests are sent to the service. Create
1870+
another pod to make requests to the service. Update the service''s sessionAffinity
18711871
to "None". Service update MUST be successful. When a requests are made to the
18721872
service on node''s IP and NodePort, service MUST be able serve the hostname from
18731873
any pod of the replica. When service''s sessionAffinily is updated back to "ClientIP",
@@ -1882,15 +1882,15 @@
18821882
service with type clusterIP [LinuxOnly] [Conformance]'
18831883
description: 'Create a service of type "ClusterIP". Service''s sessionAffinity is
18841884
set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP"
1885-
to the service. Create a Replication Controller to ensure that 3 pods are running
1886-
and are targeted by the service to serve hostname of the pod when requests are
1887-
sent to the service. Create another pod to make requests to the service. Update
1888-
the service''s sessionAffinity to "None". Service update MUST be successful. When
1889-
a requests are made to the service, it MUST be able serve the hostname from any
1890-
pod of the replica. When service''s sessionAffinily is updated back to "ClientIP",
1891-
service MUST serve the hostname from the same pod of the replica for all consecutive
1892-
requests. Service MUST be reachable over serviceName and the ClusterIP on servicePort.
1893-
[LinuxOnly]: Windows does not support session affinity.'
1885+
to the service. Create a Deployment to ensure that 3 pods are running and are
1886+
targeted by the service to serve hostname of the pod when requests are sent to
1887+
the service. Create another pod to make requests to the service. Update the service''s
1888+
sessionAffinity to "None". Service update MUST be successful. When a requests
1889+
are made to the service, it MUST be able serve the hostname from any pod of the
1890+
replica. When service''s sessionAffinily is updated back to "ClientIP", service
1891+
MUST serve the hostname from the same pod of the replica for all consecutive requests.
1892+
Service MUST be reachable over serviceName and the ClusterIP on servicePort. [LinuxOnly]:
1893+
Windows does not support session affinity.'
18941894
release: v1.19
18951895
file: test/e2e/network/service.go
18961896
- testname: Service, complete ServiceStatus lifecycle
@@ -1922,24 +1922,24 @@
19221922
description: 'Create a service of type "NodePort" and provide service port and protocol.
19231923
Service''s sessionAffinity is set to "ClientIP". Service creation MUST be successful
19241924
by assigning a "ClusterIP" to service and allocating NodePort on all nodes. Create
1925-
a Replication Controller to ensure that 3 pods are running and are targeted by
1926-
the service to serve hostname of the pod when a requests are sent to the service.
1927-
Create another pod to make requests to the service on node''s IP and NodePort.
1928-
Service MUST serve the hostname from the same pod of the replica for all consecutive
1929-
requests. Service MUST be reachable over serviceName and the ClusterIP on servicePort.
1930-
Service MUST also be reachable over node''s IP on NodePort. [LinuxOnly]: Windows
1931-
does not support session affinity.'
1925+
a Deployment to ensure that 3 pods are running and are targeted by the service
1926+
to serve hostname of the pod when a requests are sent to the service. Create another
1927+
pod to make requests to the service on node''s IP and NodePort. Service MUST serve
1928+
the hostname from the same pod of the replica for all consecutive requests. Service
1929+
MUST be reachable over serviceName and the ClusterIP on servicePort. Service MUST
1930+
also be reachable over node''s IP on NodePort. [LinuxOnly]: Windows does not support
1931+
session affinity.'
19321932
release: v1.19
19331933
file: test/e2e/network/service.go
19341934
- testname: Service, ClusterIP type, session affinity to ClientIP
19351935
codename: '[sig-network] Services should have session affinity work for service
19361936
with type clusterIP [LinuxOnly] [Conformance]'
19371937
description: 'Create a service of type "ClusterIP". Service''s sessionAffinity is
19381938
set to "ClientIP". Service creation MUST be successful by assigning "ClusterIP"
1939-
to the service. Create a Replication Controller to ensure that 3 pods are running
1940-
and are targeted by the service to serve hostname of the pod when requests are
1941-
sent to the service. Create another pod to make requests to the service. Service
1942-
MUST serve the hostname from the same pod of the replica for all consecutive requests.
1939+
to the service. Create a Deployment to ensure that 3 pods are running and are
1940+
targeted by the service to serve hostname of the pod when requests are sent to
1941+
the service. Create another pod to make requests to the service. Service MUST
1942+
serve the hostname from the same pod of the replica for all consecutive requests.
19431943
Service MUST be reachable over serviceName and the ClusterIP on servicePort. [LinuxOnly]:
19441944
Windows does not support session affinity.'
19451945
release: v1.19

0 commit comments

Comments
 (0)