From 1559bae2a2060fda27fc38405e8aa20d8783402d Mon Sep 17 00:00:00 2001 From: cybwan Date: Mon, 23 May 2022 14:44:51 +0800 Subject: [PATCH 1/5] Fixed issue 1: Change osm container's image name. --- Makefile | 54 ++++++++++++------------- charts/osm/values.yaml | 16 ++++---- demo/deploy-bookbuyer.sh | 2 +- demo/deploy-bookstore-with-same-sa.sh | 2 +- demo/deploy-bookstore.sh | 2 +- demo/deploy-bookthief.sh | 2 +- demo/deploy-bookwarehouse.sh | 2 +- demo/deploy-tcp-client.sh | 2 +- demo/deploy-tcp-echo-service.sh | 2 +- tests/e2e/e2e_tcp_client_server_test.go | 2 +- tests/e2e/e2e_tcp_egress_test.go | 4 +- tests/framework/common.go | 14 +++---- tests/framework/common_apps.go | 4 +- 13 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Makefile b/Makefile index b0abb1e54..f68c763ef 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,9 @@ endif VERSION ?= edge BUILD_DATE ?= GIT_SHA=$$(git rev-parse HEAD) -BUILD_DATE_VAR := github.com/openservicemesh/osm/pkg/version.BuildDate -BUILD_VERSION_VAR := github.com/openservicemesh/osm/pkg/version.Version -BUILD_GITCOMMIT_VAR := github.com/openservicemesh/osm/pkg/version.GitCommit +BUILD_DATE_VAR := github.com/flomesh-io/osm-edge/pkg/version.BuildDate +BUILD_VERSION_VAR := github.com/flomesh-io/osm-edge/pkg/version.Version +BUILD_GITCOMMIT_VAR := github.com/flomesh-io/osm-edge/pkg/version.GitCommit DOCKER_GO_VERSION = 1.17 DOCKER_BUILDX_PLATFORM ?= linux/amd64 # Value for the --output flag on docker buildx build. @@ -128,7 +128,7 @@ kind-reset: .PHONY: test-e2e test-e2e: DOCKER_BUILDX_OUTPUT=type=docker -test-e2e: docker-build-osm build-osm docker-build-tcp-echo-server +test-e2e: go test ./tests/e2e $(E2E_FLAGS_DEFAULT) $(E2E_FLAGS) .env: @@ -149,40 +149,40 @@ DOCKER_DEMO_TARGETS = $(addprefix docker-build-, $(DEMO_TARGETS)) .PHONY: $(DOCKER_DEMO_TARGETS) $(DOCKER_DEMO_TARGETS): NAME=$(@:docker-build-%=%) $(DOCKER_DEMO_TARGETS): - docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-demo-$(NAME):$(CTR_TAG) -f dockerfiles/Dockerfile.demo --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg BINARY=$(NAME) . + docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-edge-demo-$(NAME):$(CTR_TAG) -f dockerfiles/Dockerfile.demo --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg BINARY=$(NAME) . .PHONY: docker-build-demo docker-build-demo: $(DOCKER_DEMO_TARGETS) -.PHONY: docker-build-osm-sidecar-init -docker-build-osm-sidecar-init: - docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-sidecar-init:$(CTR_TAG) - < dockerfiles/Dockerfile.osm-sidecar-init +.PHONY: docker-build-osm-edge-sidecar-init +docker-build-osm-edge-sidecar-init: + docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-edge-sidecar-init:$(CTR_TAG) - < dockerfiles/Dockerfile.osm-sidecar-init -.PHONY: docker-build-osm-controller -docker-build-osm-controller: - docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-controller:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-controller --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . +.PHONY: docker-build-osm-edge-controller +docker-build-osm-edge-controller: + docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-edge-controller:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-controller --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . -.PHONY: docker-build-osm-injector -docker-build-osm-injector: - docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-injector:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-injector --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . +.PHONY: docker-build-osm-edge-injector +docker-build-osm-edge-injector: + docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-edge-injector:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-injector --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . -.PHONY: docker-build-osm-crds -docker-build-osm-crds: - docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-crds:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-crds ./cmd/osm-bootstrap/crds +.PHONY: docker-build-osm-edge-crds +docker-build-osm-edge-crds: + docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-edge-crds:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-crds ./cmd/osm-bootstrap/crds -.PHONY: docker-build-osm-bootstrap -docker-build-osm-bootstrap: - docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-bootstrap:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-bootstrap --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . +.PHONY: docker-build-osm-edge-bootstrap +docker-build-osm-edge-bootstrap: + docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-edge-bootstrap:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-bootstrap --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . -.PHONY: docker-build-osm-preinstall -docker-build-osm-preinstall: - docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-preinstall:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-preinstall --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . +.PHONY: docker-build-osm-edge-preinstall +docker-build-osm-edge-preinstall: + docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-edge-preinstall:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-preinstall --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . -.PHONY: docker-build-osm-healthcheck -docker-build-osm-healthcheck: - docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-healthcheck:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-healthcheck --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . +.PHONY: docker-build-osm-edge-healthcheck +docker-build-osm-edge-healthcheck: + docker buildx build --builder osm --platform=$(DOCKER_BUILDX_PLATFORM) -o $(DOCKER_BUILDX_OUTPUT) -t $(CTR_REGISTRY)/osm-edge-healthcheck:$(CTR_TAG) -f dockerfiles/Dockerfile.osm-healthcheck --build-arg GO_VERSION=$(DOCKER_GO_VERSION) --build-arg LDFLAGS=$(LDFLAGS) . -OSM_TARGETS = osm-sidecar-init osm-controller osm-injector osm-crds osm-bootstrap osm-preinstall osm-healthcheck +OSM_TARGETS = osm-edge-sidecar-init osm-edge-controller osm-edge-injector osm-edge-crds osm-edge-bootstrap osm-edge-preinstall osm-edge-healthcheck DOCKER_OSM_TARGETS = $(addprefix docker-build-, $(OSM_TARGETS)) .PHONY: docker-build-osm diff --git a/charts/osm/values.yaml b/charts/osm/values.yaml index 9987d2381..adb55b114 100644 --- a/charts/osm/values.yaml +++ b/charts/osm/values.yaml @@ -8,7 +8,7 @@ osm: # -- OSM control plane image parameters image: # -- Container image registry for control plane images - registry: openservicemesh + registry: flomesh # -- Container image pull policy for control plane containers pullPolicy: IfNotPresent # -- Container image tag for control plane images @@ -16,19 +16,19 @@ osm: # -- Image name defaults name: # -- osm-controller's image name - osmController: osm-controller + osmController: osm-edge-controller # -- osm-injector's image name - osmInjector: osm-injector + osmInjector: osm-edge-injector # -- Sidecar init container's image name - osmSidecarInit: osm-sidecar-init + osmSidecarInit: osm-edge-sidecar-init # -- osm-boostrap's image name - osmBootstrap: osm-bootstrap + osmBootstrap: osm-edge-bootstrap # -- osm-crds' image name - osmCRDs: osm-crds + osmCRDs: osm-edge-crds # -- osm-preinstall's image name - osmPreinstall: osm-preinstall + osmPreinstall: osm-edge-preinstall # -- osm-healthcheck's image name - osmHealthcheck: osm-healthcheck + osmHealthcheck: osm-edge-healthcheck # -- Image digest (defaults to latest compatible tag) digest: # -- osm-controller's image digest diff --git a/demo/deploy-bookbuyer.sh b/demo/deploy-bookbuyer.sh index ae4d08b26..302b3b594 100755 --- a/demo/deploy-bookbuyer.sh +++ b/demo/deploy-bookbuyer.sh @@ -58,7 +58,7 @@ spec: containers: # Main container with APP - name: bookbuyer - image: "${CTR_REGISTRY}/osm-demo-bookbuyer:${CTR_TAG}" + image: "${CTR_REGISTRY}/osm-edge-demo-bookbuyer:${CTR_TAG}" imagePullPolicy: Always command: ["/bookbuyer"] diff --git a/demo/deploy-bookstore-with-same-sa.sh b/demo/deploy-bookstore-with-same-sa.sh index 53860620b..60866b931 100755 --- a/demo/deploy-bookstore-with-same-sa.sh +++ b/demo/deploy-bookstore-with-same-sa.sh @@ -81,7 +81,7 @@ spec: kubernetes.io/arch: ${KUBERNETES_NODE_ARCH} kubernetes.io/os: ${KUBERNETES_NODE_OS} containers: - - image: "${CTR_REGISTRY}/osm-demo-bookstore:${CTR_TAG}" + - image: "${CTR_REGISTRY}/osm-edge-demo-bookstore:${CTR_TAG}" imagePullPolicy: Always name: $SVC ports: diff --git a/demo/deploy-bookstore.sh b/demo/deploy-bookstore.sh index 188aab92b..edb515807 100755 --- a/demo/deploy-bookstore.sh +++ b/demo/deploy-bookstore.sh @@ -94,7 +94,7 @@ spec: kubernetes.io/arch: ${KUBERNETES_NODE_ARCH} kubernetes.io/os: ${KUBERNETES_NODE_OS} containers: - - image: "${CTR_REGISTRY}/osm-demo-bookstore:${CTR_TAG}" + - image: "${CTR_REGISTRY}/osm-edge-demo-bookstore:${CTR_TAG}" imagePullPolicy: Always name: $SVC ports: diff --git a/demo/deploy-bookthief.sh b/demo/deploy-bookthief.sh index f1558ef15..e5ed074e9 100755 --- a/demo/deploy-bookthief.sh +++ b/demo/deploy-bookthief.sh @@ -76,7 +76,7 @@ spec: containers: # Main container with APP - name: bookthief - image: "${CTR_REGISTRY}/osm-demo-bookthief:${CTR_TAG}" + image: "${CTR_REGISTRY}/osm-edge-demo-bookthief:${CTR_TAG}" imagePullPolicy: Always command: ["/bookthief"] diff --git a/demo/deploy-bookwarehouse.sh b/demo/deploy-bookwarehouse.sh index 3d800858b..3d8ff90ef 100755 --- a/demo/deploy-bookwarehouse.sh +++ b/demo/deploy-bookwarehouse.sh @@ -72,7 +72,7 @@ spec: containers: # Main container with APP - name: bookwarehouse - image: "${CTR_REGISTRY}/osm-demo-bookwarehouse:${CTR_TAG}" + image: "${CTR_REGISTRY}/osm-edge-demo-bookwarehouse:${CTR_TAG}" imagePullPolicy: Always command: ["/bookwarehouse"] env: diff --git a/demo/deploy-tcp-client.sh b/demo/deploy-tcp-client.sh index 5a3af9b22..1743230c9 100755 --- a/demo/deploy-tcp-client.sh +++ b/demo/deploy-tcp-client.sh @@ -48,7 +48,7 @@ spec: kubernetes.io/os: ${KUBERNETES_NODE_OS} containers: - name: tcp-client - image: "${CTR_REGISTRY}/osm-demo-tcp-client:${CTR_TAG}" + image: "${CTR_REGISTRY}/osm-edge-demo-tcp-client:${CTR_TAG}" imagePullPolicy: Always command: ["/tcp-client"] args: [ "--server-address", "tcp-echo:9000" ] diff --git a/demo/deploy-tcp-echo-service.sh b/demo/deploy-tcp-echo-service.sh index 33c66c712..ee27fad4b 100755 --- a/demo/deploy-tcp-echo-service.sh +++ b/demo/deploy-tcp-echo-service.sh @@ -66,7 +66,7 @@ spec: kubernetes.io/os: ${KUBERNETES_NODE_OS} containers: - name: tcp-echo-server - image: "${CTR_REGISTRY}/osm-demo-tcp-echo-server:${CTR_TAG}" + image: "${CTR_REGISTRY}/osm-edge-demo-tcp-echo-server:${CTR_TAG}" imagePullPolicy: Always command: ["/tcp-echo-server"] args: [ "--port", "9000" ] diff --git a/tests/e2e/e2e_tcp_client_server_test.go b/tests/e2e/e2e_tcp_client_server_test.go index dd6c29863..44e647aaa 100644 --- a/tests/e2e/e2e_tcp_client_server_test.go +++ b/tests/e2e/e2e_tcp_client_server_test.go @@ -45,7 +45,7 @@ func testTCPTraffic(permissiveMode bool) { Expect(Td.InstallOSM(installOpts)).To(Succeed()) // Load TCP server image - Expect(Td.LoadImagesToKind([]string{"osm-demo-tcp-echo-server"})).To(Succeed()) + Expect(Td.LoadImagesToKind([]string{"osm-edge-demo-tcp-echo-server"})).To(Succeed()) // Create Test NS for _, n := range ns { diff --git a/tests/e2e/e2e_tcp_egress_test.go b/tests/e2e/e2e_tcp_egress_test.go index df4393453..002ebbcec 100644 --- a/tests/e2e/e2e_tcp_egress_test.go +++ b/tests/e2e/e2e_tcp_egress_test.go @@ -40,7 +40,7 @@ func testTCPEgressTraffic() { meshConfig, _ := Td.GetMeshConfig(Td.OsmNamespace) // Load TCP server image - Expect(Td.LoadImagesToKind([]string{"osm-demo-tcp-echo-server"})).To(Succeed()) + Expect(Td.LoadImagesToKind([]string{"osm-edge-demo-tcp-echo-server"})).To(Succeed()) // Create client ns and add it to the mesh Expect(Td.CreateNs(sourceName, nil)).To(Succeed()) @@ -56,7 +56,7 @@ func testTCPEgressTraffic() { SimplePodAppDef{ PodName: destName, Namespace: destName, - Image: fmt.Sprintf("%s/osm-demo-tcp-echo-server:%s", installOpts.ContainerRegistryLoc, installOpts.OsmImagetag), + Image: fmt.Sprintf("%s/osm-edge-demo-tcp-echo-server:%s", installOpts.ContainerRegistryLoc, installOpts.OsmImagetag), Command: []string{"/tcp-echo-server"}, Args: []string{"--port", fmt.Sprintf("%d", destinationPort)}, Ports: []int{destinationPort}, diff --git a/tests/framework/common.go b/tests/framework/common.go index 70e0447dc..ccf2cc949 100644 --- a/tests/framework/common.go +++ b/tests/framework/common.go @@ -623,13 +623,13 @@ func (td *OsmTestData) GetMeshConfig(namespace string) (*configv1alpha2.MeshConf // LoadOSMImagesIntoKind loads the OSM images to the node for Kind clusters func (td *OsmTestData) LoadOSMImagesIntoKind() error { imageNames := []string{ - constants.OSMControllerName, - constants.OSMInjectorName, - "init", - "osm-crds", - constants.OSMBootstrapName, - "osm-preinstall", - "osm-healthcheck", + "osm-edge-controller", + "osm-edge-injector", + "osm-edge-sidecar-init", + "osm-edge-crds", + "osm-edge-bootstrap", + "osm-edge-preinstall", + "osm-edge-healthcheck", } return td.LoadImagesToKind(imageNames) diff --git a/tests/framework/common_apps.go b/tests/framework/common_apps.go index a333bb139..b0784e772 100644 --- a/tests/framework/common_apps.go +++ b/tests/framework/common_apps.go @@ -593,10 +593,10 @@ func (td *OsmTestData) GetOSSpecificTCPEchoPod(podName string, namespace string, var command string installOpts := Td.GetOSMInstallOpts() if td.ClusterOS == constants.OSWindows { - image = fmt.Sprintf("%s/osm-demo-tcp-echo-server-windows:%s", installOpts.ContainerRegistryLoc, installOpts.OsmImagetag) + image = fmt.Sprintf("%s/osm-edge-demo-tcp-echo-server-windows:%s", installOpts.ContainerRegistryLoc, installOpts.OsmImagetag) command = "/tcp-echo-server.exe" } else { - image = fmt.Sprintf("%s/osm-demo-tcp-echo-server:%s", installOpts.ContainerRegistryLoc, installOpts.OsmImagetag) + image = fmt.Sprintf("%s/osm-edge-demo-tcp-echo-server:%s", installOpts.ContainerRegistryLoc, installOpts.OsmImagetag) command = "/tcp-echo-server" } return Td.SimplePodApp( From e75b23f4f7671e6740141e88868e1c407208d470 Mon Sep 17 00:00:00 2001 From: cybwan Date: Mon, 23 May 2022 16:30:41 +0800 Subject: [PATCH 2/5] Fixed missing osm.nodeSelector.arch. --- tests/framework/helm.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/framework/helm.go b/tests/framework/helm.go index c39722a40..ea5a309c6 100644 --- a/tests/framework/helm.go +++ b/tests/framework/helm.go @@ -3,6 +3,7 @@ package framework import ( "fmt" "github.com/pkg/errors" + "runtime" ) // HelmInstallOSM installs an osm control plane using the osm chart which lives in charts/osm @@ -13,7 +14,7 @@ func (td *OsmTestData) HelmInstallOSM(release, namespace string) error { } } - values := fmt.Sprintf("osm.image.registry=%s,osm.image.tag=%s,osm.meshName=%s", td.CtrRegistryServer, td.OsmImageTag, release) + values := fmt.Sprintf("osm.image.registry=%s,osm.image.tag=%s,osm.meshName=%s,osm.nodeSelector.arch=%s", td.CtrRegistryServer, td.OsmImageTag, release, runtime.GOARCH) args := []string{"install", release, "../../charts/osm", "--set", values, "--namespace", namespace, "--create-namespace", "--wait"} stdout, stderr, err := td.RunLocal("helm", args...) if err != nil { From 6e0d00e6fd9087583eb68807ff3ee76eec9bcc71 Mon Sep 17 00:00:00 2001 From: cybwan Date: Tue, 24 May 2022 07:30:12 +0800 Subject: [PATCH 3/5] Modify bug report. --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 7c03c3460..d60adf7a8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -25,7 +25,7 @@ Be sure to not include any sensitive information. Sensitive information should _ - Permissive Traffic Policy [ ] - Ingress [ ] - Egress [ ] -- Envoy Control Plane [ ] +- Sidecar Control Plane [ ] - CLI Tool [ ] - Metrics [ ] - Certificate Management [ ] From ec49e14432d4370d6da8cd00c6f4627785447e2c Mon Sep 17 00:00:00 2001 From: cybwan Date: Tue, 24 May 2022 09:49:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Fix=20issue=20#9:=20Pipy=E2=80=98s=20policy?= =?UTF-8?q?=20json=20lacks=20support=20for=20grpc=20protocol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/pipy/repo/util.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/pipy/repo/util.go b/pkg/pipy/repo/util.go index ac3d20a36..6e4fbddfd 100644 --- a/pkg/pipy/repo/util.go +++ b/pkg/pipy/repo/util.go @@ -28,7 +28,8 @@ func generatePipyInboundTrafficPolicy(meshCatalog catalog.MeshCataloger, _ ident tm.SetProtocol(Protocol(trafficMatch.DestinationProtocol)) tm.SetPort(Port(trafficMatch.DestinationPort)) - if trafficMatch.DestinationProtocol == constants.ProtocolHTTP { + if trafficMatch.DestinationProtocol == constants.ProtocolHTTP || + trafficMatch.DestinationProtocol == constants.ProtocolGRPC { upstreamSvcFQDN := upstreamSvc.FQDN() httpRouteConfig := getInboundHttpRouteConfigs(inboundPolicy.HTTPRouteConfigsPerPort, @@ -126,7 +127,8 @@ func generatePipyOutboundTrafficRoutePolicy(_ catalog.MeshCataloger, proxyIdenti tm.AddDestinationIPRange(DestinationIPRange(ipRange)) } - if trafficMatch.DestinationProtocol == constants.ProtocolHTTP { + if trafficMatch.DestinationProtocol == constants.ProtocolHTTP || + trafficMatch.DestinationProtocol == constants.ProtocolGRPC { upstreamSvc := trafficMatchToMeshSvc(trafficMatch) upstreamSvcFQDN := upstreamSvc.FQDN() @@ -203,7 +205,8 @@ func generatePipyEgressTrafficRoutePolicy(_ catalog.MeshCataloger, _ identity.Se tm.AddDestinationIPRange(DestinationIPRange(ipRange)) } - if trafficMatch.DestinationProtocol == constants.ProtocolHTTP { + if trafficMatch.DestinationProtocol == constants.ProtocolHTTP || + trafficMatch.DestinationProtocol == constants.ProtocolGRPC { httpRouteConfigs := getEgressHttpRouteConfigs(egressPolicy.HTTPRouteConfigsPerPort, trafficMatch.DestinationPort, trafficMatch.Name) From ed191dbd4c7c8e7cdc68743d5dc4a93987e4716b Mon Sep 17 00:00:00 2001 From: cybwan Date: Wed, 25 May 2022 08:47:02 +0800 Subject: [PATCH 5/5] Fixed issue #10 --- .github/workflows/codeql-analysis.yml | 4 +- .github/workflows/main.yml | 16 +++--- .github/workflows/openshift-nightly.yml | 69 ------------------------- .github/workflows/release.yml | 40 +++++++------- .github/workflows/windows-nightly.yml | 36 ------------- Makefile | 6 +-- 6 files changed, 33 insertions(+), 138 deletions(-) delete mode 100644 .github/workflows/openshift-nightly.yml delete mode 100644 .github/workflows/windows-nightly.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 499b8ba95..dd896bda8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -60,5 +60,5 @@ jobs: - name: Autobuild uses: github/codeql-action/autobuild@v1 - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + #- name: Perform CodeQL Analysis + # uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e64966a1e..5ddeace3e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,14 +25,14 @@ env: OSM_HUMAN_DEBUG_LOG: true jobs: - shellcheck: - name: Shellcheck - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: ShellCheck - run: shellcheck -x $(find . -name '*.sh') + #shellcheck: + # name: Shellcheck + # runs-on: ubuntu-latest + # steps: + # - name: Checkout + # uses: actions/checkout@v2 + # - name: ShellCheck + # run: shellcheck -x $(find . -name '*.sh') lint: name: Lint diff --git a/.github/workflows/openshift-nightly.yml b/.github/workflows/openshift-nightly.yml deleted file mode 100644 index 996ad62f0..000000000 --- a/.github/workflows/openshift-nightly.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: OpenShift Nightly Job -on: - workflow_run: - workflows: ["Nightly Images"] - types: [completed] - -env: - CTR_REGISTRY: openservicemesh - CTR_TAG: latest-main - -jobs: - test: - name: OpenShift Nightly Job - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} - steps: - - name: Checkout v2 - uses: actions/checkout@v2 - - name: Authenticate and set context - uses: redhat-actions/oc-login@v1 - with: - openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }} - openshift_token: ${{ secrets.OPENSHIFT_TOKEN }} - insecure_skip_tls_verify: true - - name: Test oc - run: oc version --client - - name: Setup Go 1.17 - uses: actions/setup-go@v2 - with: - go-version: 1.17 - - name: Run e2es - run: | - make build-osm - go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -ginkgo.skip="\bHTTP ingress\b" -ginkgo.skip="\bUpgrade\b" -test.timeout 180m -deployOnOpenShift=true - - name: Run Simulation w/ Tresor, SMI policies, egress disabled and reconciler disabled - env: - CERT_MANAGER: "tresor" - BOOKSTORE_SVC: "bookstore" - BOOKTHIEF_EXPECTED_RESPONSE_CODE: "0" - ENABLE_EGRESS: "false" - ENABLE_RECONCILER: "false" - DEPLOY_TRAFFIC_SPLIT: "true" - DEPLOY_ON_OPENSHIFT: "true" - TIMEOUT: 150s - CI_WAIT_FOR_OK_SECONDS: 60 - CI_MAX_ITERATIONS_THRESHOLD: 60 - CI_CLIENT_CONCURRENT_CONNECTIONS: 1 - CI_MAX_WAIT_FOR_POD_TIME_SECONDS: 150 - CI_MIN_SUCCESS_THRESHOLD: 1 - OSM_HUMAN_DEBUG_LOG: true - USE_PRIVATE_REGISTRY: "false" - PUBLISH_IMAGES: "false" - run: | - touch .env - ./demo/run-osm-demo.sh - go run ./ci/cmd/maestro.go - - name: Cleanup resources - if: ${{ always() }} - env: - BOOKWAREHOUSE_NAMESPACE: bookwarehouse - BOOKBUYER_NAMESPACE: bookbuyer - BOOKSTORE_NAMESPACE: bookstore - BOOKTHIEF_NAMESPACE: bookthief - MESH_NAME: osm - K8S_NAMESPACE: osm-system - TIMEOUT: 90s - run: | - touch .env - ./demo/clean-kubernetes.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b39b5d82d..185b61e2c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,71 +60,71 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-darwin-amd64.zip" - asset_name: "osm-${{ env.VERSION }}-darwin-amd64.zip" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-darwin-amd64.zip" + asset_name: "osm-edge-${{ env.VERSION }}-darwin-amd64.zip" asset_content_type: application/zip - name: Upload macOS (amd64).tar.gz uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-darwin-amd64.tar.gz" - asset_name: "osm-${{ env.VERSION }}-darwin-amd64.tar.gz" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-darwin-amd64.tar.gz" + asset_name: "osm-edge-${{ env.VERSION }}-darwin-amd64.tar.gz" asset_content_type: application/gzip - name: Upload macOS (arm64).zip uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-darwin-arm64.zip" - asset_name: "osm-${{ env.VERSION }}-darwin-arm64.zip" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-darwin-arm64.zip" + asset_name: "osm-edge-${{ env.VERSION }}-darwin-arm64.zip" asset_content_type: application/zip - name: Upload macOS (arm64).tar.gz uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-darwin-arm64.tar.gz" - asset_name: "osm-${{ env.VERSION }}-darwin-arm64.tar.gz" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-darwin-arm64.tar.gz" + asset_name: "osm-edge-${{ env.VERSION }}-darwin-arm64.tar.gz" asset_content_type: application/gzip - name: Upload Linux (amd64).zip uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-linux-amd64.zip" - asset_name: "osm-${{ env.VERSION }}-linux-amd64.zip" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-linux-amd64.zip" + asset_name: "osm-edge-${{ env.VERSION }}-linux-amd64.zip" asset_content_type: application/zip - name: Upload Linux (amd64).tar.gz uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-linux-amd64.tar.gz" - asset_name: "osm-${{ env.VERSION }}-linux-amd64.tar.gz" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-linux-amd64.tar.gz" + asset_name: "osm-edge-${{ env.VERSION }}-linux-amd64.tar.gz" asset_content_type: application/gzip - name: Upload Linux (arm64).zip uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-linux-arm64.zip" - asset_name: "osm-${{ env.VERSION }}-linux-arm64.zip" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-linux-arm64.zip" + asset_name: "osm-edge-${{ env.VERSION }}-linux-arm64.zip" asset_content_type: application/zip - name: Upload Linux (arm64).tar.gz uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-linux-arm64.tar.gz" - asset_name: "osm-${{ env.VERSION }}-linux-arm64.tar.gz" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-linux-arm64.tar.gz" + asset_name: "osm-edge-${{ env.VERSION }}-linux-arm64.tar.gz" asset_content_type: application/gzip - name: Upload Windows .zip uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-windows-amd64.zip" - asset_name: "osm-${{ env.VERSION }}-windows-amd64.zip" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-windows-amd64.zip" + asset_name: "osm-edge-${{ env.VERSION }}-windows-amd64.zip" asset_content_type: application/zip - name: Upload Windows .tar.gz uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: "_dist/osm-${{ env.VERSION }}-windows-amd64.tar.gz" - asset_name: "osm-${{ env.VERSION }}-windows-amd64.tar.gz" + asset_path: "_dist/osm-edge-${{ env.VERSION }}-windows-amd64.tar.gz" + asset_name: "osm-edge-${{ env.VERSION }}-windows-amd64.tar.gz" asset_content_type: application/gzip - name: Upload Checksums uses: actions/upload-release-asset@v1 diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml deleted file mode 100644 index 29f28cfed..000000000 --- a/.github/workflows/windows-nightly.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Windows Nightly Job -on: - workflow_run: - workflows: ["Nightly Images"] - types: [completed] - -env: - CTR_REGISTRY: openservicemesh - CTR_TAG: latest-main - -jobs: - test: - name: Windows Cluster Nightly Job - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} - steps: - - name: Checkout v2 - uses: actions/checkout@v2 - - name: Authenticate and set context - uses: azure/k8s-set-context@v1 - with: - method: kubeconfig - kubeconfig: ${{ secrets.CI_WINDOWS_KUBECONFIG }} - id: setcontext - - name: Setup Go 1.17 - uses: actions/setup-go@v2 - with: - go-version: 1.17 - - name: Run e2es - run: | - make build-osm - go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -ginkgo.focus='\[Cross-platform\]|\[windows\]' -test.timeout 180m -deployOnWindowsWorkers=true - - name: Cleanup resources - if: ${{ always() }} - run: | - kubectl delete service vault -n osm-system --ignore-not-found --wait diff --git a/Makefile b/Makefile index f68c763ef..f4fd73548 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ ifeq ($(shell uname),Darwin) SHA256 = shasum -a 256 endif -VERSION ?= edge +VERSION ?= dev BUILD_DATE ?= GIT_SHA=$$(git rev-parse HEAD) BUILD_DATE_VAR := github.com/flomesh-io/osm-edge/pkg/version.BuildDate @@ -269,8 +269,8 @@ dist: cd _dist && \ $(DIST_DIRS) cp ../LICENSE {} \; && \ $(DIST_DIRS) cp ../README.md {} \; && \ - $(DIST_DIRS) tar -zcf osm-${VERSION}-{}.tar.gz {} \; && \ - $(DIST_DIRS) zip -r osm-${VERSION}-{}.zip {} \; && \ + $(DIST_DIRS) tar -zcf osm-edge-${VERSION}-{}.tar.gz {} \; && \ + $(DIST_DIRS) zip -r osm-edge-${VERSION}-{}.zip {} \; && \ $(SHA256) osm-* > sha256sums.txt \ )