Fixed issue #9, issue #10

.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     [ ]

.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

.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

.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

Makefile

@@ -15,12 +15,12 @@ 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/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
@@ -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 \
 	)
 

charts/osm/values.yaml

@@ -8,27 +8,27 @@ 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
     tag: ""
     # -- 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

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"]
 

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: