This repository has been archived by the owner on Jul 11, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 276
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature/statefulsets: fix protocol detection for ports (#4752)
Fixes k8s service port protocol detection and adds a headless service example to the demo. Fixes #3477 Signed-off-by: Keith Mattix II <[email protected]>
- Loading branch information
1 parent
d1ef8b1
commit 9b11d76
Showing
8 changed files
with
287 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -aueo pipefail | ||
|
|
||
| # shellcheck disable=SC1091 | ||
| source .env | ||
| DEPLOY_ON_OPENSHIFT="${DEPLOY_ON_OPENSHIFT:-false}" | ||
| USE_PRIVATE_REGISTRY="${USE_PRIVATE_REGISTRY:-false}" | ||
| MESH_NAME="${MESH_NAME:-osm}" | ||
|
|
||
| kubectl create ns zookeeper | ||
|
|
||
| bin/osm namespace add --mesh-name "$MESH_NAME" zookeeper | ||
|
|
||
| bin/osm metrics enable --namespace zookeeper | ||
|
|
||
|
|
||
| helm install kafka bitnami/zookeeper --set replicaCount=3 --set serviceAccount.create=true --set serviceAccount.name=zookeeper --namespace zookeeper | ||
|
|
||
| if [ "$DEPLOY_ON_OPENSHIFT" = true ] ; then | ||
| oc adm policy add-scc-to-user privileged -z "zookeeper" -n "zookeeper" | ||
| if [ "$USE_PRIVATE_REGISTRY" = true ]; then | ||
| oc secrets link "zookeeper" "$CTR_REGISTRY_CREDS_NAME" --for=pull -n "zookeeper" | ||
| fi | ||
| fi | ||
|
|
||
| kubectl apply -nzookeeper -f - <<EOF | ||
| kind: TrafficTarget | ||
| apiVersion: access.smi-spec.io/v1alpha3 | ||
| metadata: | ||
| name: zookeeper | ||
| namespace: zookeeper | ||
| spec: | ||
| destination: | ||
| kind: ServiceAccount | ||
| name: zookeeper | ||
| namespace: zookeeper | ||
| rules: | ||
| - kind: TCPRoute | ||
| name: zookeeper | ||
| sources: | ||
| - kind: ServiceAccount | ||
| name: zookeeper | ||
| namespace: zookeeper | ||
| --- | ||
| apiVersion: specs.smi-spec.io/v1alpha4 | ||
| kind: TCPRoute | ||
| metadata: | ||
| name: zookeeper | ||
| namespace: zookeeper | ||
| spec: | ||
| matches: | ||
| ports: | ||
| - 2181 | ||
| - 3181 | ||
| - 2888 | ||
| - 3888 | ||
| EOF | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| package e2e | ||
|
|
||
| import ( | ||
| "context" | ||
| "strings" | ||
| "time" | ||
|
|
||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
| "github.com/rs/zerolog/log" | ||
| "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha3" | ||
| "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4" | ||
| "helm.sh/helm/v3/pkg/action" | ||
| "helm.sh/helm/v3/pkg/chart/loader" | ||
| "helm.sh/helm/v3/pkg/cli" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
|
|
||
| "github.com/openservicemesh/osm/pkg/apis/config/v1alpha2" | ||
| . "github.com/openservicemesh/osm/tests/framework" | ||
| ) | ||
|
|
||
| var _ = OSMDescribe("Test traffic among Statefulset members", | ||
| OSMDescribeInfo{ | ||
| Tier: 1, | ||
| Bucket: 9, | ||
| OS: OSCrossPlatform, | ||
| }, | ||
| func() { | ||
| Context("Statefulsets", func() { | ||
| It("pods succeed while establishing consensus", func() { | ||
| // Install OSM (with proxyMode = podIP) | ||
| Expect(Td.InstallOSM(Td.GetOSMInstallOpts(WithLocalProxyMode(v1alpha2.LocalProxyModePodIP)))).To(Succeed()) | ||
|
|
||
| const testNS = "zookeeper" | ||
|
|
||
| // Create Test NS | ||
| Expect(Td.CreateNs(testNS, nil)).To(Succeed()) | ||
| Expect(Td.AddNsToMesh(true, testNS)).To(Succeed()) | ||
|
|
||
| helmCfg := &action.Configuration{} | ||
| Expect(helmCfg.Init(Td.Env.RESTClientGetter(), testNS, "secret", log.Info().Msgf)).To(Succeed()) | ||
|
|
||
| install := action.NewInstall(helmCfg) | ||
|
|
||
| install.ReleaseName = "kafka" | ||
| install.Namespace = testNS | ||
| install.Timeout = 30 * time.Second | ||
| saName := "zookeeper" | ||
| replicaCount := 3 | ||
|
|
||
| cli := cli.New() | ||
| chartPath, err := install.LocateChart("https://charts.bitnami.com/bitnami/zookeeper-9.0.2.tgz", cli) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| chart, err := loader.Load(chartPath) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| // Install zookeeper | ||
| _, err = install.Run(chart, map[string]interface{}{ | ||
| "replicaCount": replicaCount, | ||
| "serviceAccount": map[string]interface{}{ | ||
| "create": true, | ||
| "name": saName, | ||
| }, | ||
| }) | ||
|
|
||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| // Create SMI resources for Zookeeper | ||
| _, err = Td.CreateTCPRoute(testNS, v1alpha4.TCPRoute{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: testNS, | ||
| Name: "zookeeper", | ||
| }, | ||
| Spec: v1alpha4.TCPRouteSpec{ | ||
| Matches: v1alpha4.TCPMatch{ | ||
| Ports: []int{2181, 3181, 2888, 3888}, | ||
| }, | ||
| }, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| _, err = Td.CreateTrafficTarget(testNS, v1alpha3.TrafficTarget{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: testNS, | ||
| Name: "zookeeper", | ||
| }, | ||
| Spec: v1alpha3.TrafficTargetSpec{ | ||
| Sources: []v1alpha3.IdentityBindingSubject{ | ||
| { | ||
| Kind: "ServiceAccount", | ||
| Name: saName, | ||
| Namespace: testNS, | ||
| }, | ||
| }, | ||
| Destination: v1alpha3.IdentityBindingSubject{ | ||
| Kind: "ServiceAccount", | ||
| Name: saName, | ||
| Namespace: testNS, | ||
| }, | ||
| Rules: []v1alpha3.TrafficTargetRule{ | ||
| { | ||
| Kind: "TCPRoute", | ||
| Name: "zookeeper", | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| Expect(Td.WaitForPodsRunningReady(testNS, 90*time.Second, replicaCount, nil)).To(Succeed()) | ||
|
|
||
| pods, err := Td.Client.CoreV1().Pods(testNS).List(context.TODO(), metav1.ListOptions{}) | ||
|
|
||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| // this command will exit 1 if connectivity isn't established | ||
| cmd := "/opt/bitnami/zookeeper/bin/zkServer.sh status" | ||
|
|
||
| cond := Td.WaitForRepeatedSuccess(func() bool { | ||
|
|
||
| results := map[string]error{} | ||
| for _, po := range pods.Items { | ||
| stdout, stderr, err := Td.RunRemote(testNS, po.GetName(), "zookeeper", strings.Fields(cmd)) | ||
|
|
||
| Td.T.Logf("> (%s) Stdout %s | Stderr: %s", po.GetName(), stdout, stderr) | ||
|
|
||
| results[po.GetName()] = err | ||
| } | ||
|
|
||
| hadErr := false | ||
| for podName, err := range results { | ||
| if err != nil { | ||
| Td.T.Logf("> (%s) ZK status check failed: expected nil err, got %s", podName, err) | ||
| hadErr = true | ||
| continue | ||
| } | ||
|
|
||
| Td.T.Logf("> (%s) ZK status check succeeded!", podName) | ||
| } | ||
|
|
||
| return !hadErr | ||
| }, 1, 90*time.Second) | ||
|
|
||
| Expect(cond).To(BeTrue()) | ||
|
|
||
| }) | ||
| }) | ||
| }) |