diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 210a3e4da..a1e92782c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -40,17 +40,7 @@ jobs: run: | make docker-build tag=${{ steps.tag_env.outputs.version }} - - name: Build LazyXDS Docker Image - if: ${{ startsWith(steps.tag_type.outputs.version, 'lazyxds/') }} - run: | - make docker-build.lazyxds tag=${{ steps.tag_env.outputs.version }} - - name: Push Aeraki Docker image if: ${{ startsWith(steps.tag_type.outputs.version, 'aeraki/') }} run: | docker push aeraki/aeraki:${{ steps.tag_env.outputs.version }} - - - name: Push LazyXDS Docker image - if: ${{ startsWith(steps.tag_type.outputs.version, 'lazyxds/') }} - run: | - docker push aeraki/lazyxds:${{ steps.tag_env.outputs.version }} diff --git a/Makefile b/Makefile index ad0f30b7b..72e0ac5d8 100644 --- a/Makefile +++ b/Makefile @@ -88,34 +88,3 @@ e2e-metaprotocol: go test -v github.com/aeraki-mesh/aeraki/test/e2e/metaprotocol/... e2e: e2e-dubbo e2e-thrift e2e-kafka-zookeeper e2e-redis e2e-metaprotocol .PHONY: build docker-build docker-push clean style-check lint e2e-dubbo e2e-thrift e2e-kafka-zookeeper e2e install demo uninstall-demo - -# lazyxds -LAZYXDS_DOCKER_TAG?=aeraki/lazyxds:$(IMAGE_TAG) -LAZYXDS_DOCKER_TAG_E2E?=aeraki/lazyxds:`git log --format="%H" -n 1` -LAZYXDS_BINARY_NAME?=$(OUT)/lazyxds -LAZYXDS_BINARY_NAME_DARWIN?=$(LAZYXDS_BINARY_NAME)-darwin -LAZYXDS_MAIN?=./lazyxds/cmd/lazyxds/main.go - -build.lazyxds: test - CGO_ENABLED=0 GOOS=linux $(GOBUILD) -o $(LAZYXDS_BINARY_NAME) $(LAZYXDS_MAIN) -build-mac.lazyxds: test - CGO_ENABLED=0 GOOS=darwin $(GOBUILD) -o $(LAZYXDS_BINARY_NAME_DARWIN) $(LAZYXDS_MAIN) -docker-build.lazyxds: build.lazyxds - rm -rf $(DOCKER_TMP) - mkdir $(DOCKER_TMP) - cp ./lazyxds/docker/Dockerfile $(DOCKER_TMP) - cp $(LAZYXDS_BINARY_NAME) $(DOCKER_TMP) - docker build -t $(LAZYXDS_DOCKER_TAG) $(DOCKER_TMP) - rm -rf $(DOCKER_TMP) -docker-push.lazyxds: docker-build.lazyxds - docker push $(LAZYXDS_DOCKER_TAG) -docker-build-e2e.lazyxds: build.lazyxds - rm -rf $(DOCKER_TMP) - mkdir $(DOCKER_TMP) - cp ./lazyxds/docker/Dockerfile $(DOCKER_TMP) - cp $(LAZYXDS_BINARY_NAME) $(DOCKER_TMP) - docker build -t $(LAZYXDS_DOCKER_TAG_E2E) $(DOCKER_TMP) - rm -rf $(DOCKER_TMP) -e2e-lazyxds: - ginkgo -v ./test/e2e/lazyxds/lazyxds/ -.DEFAULT_GOAL := docker-build diff --git a/demo/common_func.sh b/demo/common_func.sh index 83b1869f6..9cc525713 100755 --- a/demo/common_func.sh +++ b/demo/common_func.sh @@ -1,23 +1,19 @@ #!/bin/bash -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at +# Copyright Aeraki Authors # -# http://www.apache.org/licenses/LICENSE-2.0 +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + #set -x diff --git a/test/e2e/common/lazyxds-controller.yaml b/test/e2e/common/lazyxds-controller.yaml deleted file mode 100644 index f57327594..000000000 --- a/test/e2e/common/lazyxds-controller.yaml +++ /dev/null @@ -1,83 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: lazyxds - namespace: istio-system - labels: - app: lazyxds ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: lazyxds - labels: - app: lazyxds -rules: - - apiGroups: ["*"] - resources: ["pods", "nodes", "namespaces", "endpoints", "secrets"] - verbs: ["get", "list", "watch"] - - apiGroups: ["*"] - resources: ["configmaps", "deployments", "services", "roles", "rolebindings", "serviceaccounts"] - verbs: ["get", "list", "watch", "create", "update", "delete"] - - apiGroups: ["networking.istio.io"] - resources: ["*"] - verbs: ["*"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: lazyxds - labels: - app: lazyxds -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: lazyxds -subjects: - - kind: ServiceAccount - namespace: istio-system - name: lazyxds ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: lazyxds - name: lazyxds - namespace: istio-system -spec: - replicas: 1 - selector: - matchLabels: - app: lazyxds - template: - metadata: - labels: - app: lazyxds - spec: - serviceAccountName: lazyxds - containers: - - image: aeraki/lazyxds:${BUILD_TAG} - imagePullPolicy: IfNotPresent - name: app - ports: - - containerPort: 8080 - protocol: TCP ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app: lazyxds - name: lazyxds - namespace: istio-system -spec: - ports: - - name: grpc-als - port: 8080 - protocol: TCP - selector: - app: lazyxds - type: ClusterIP ---- diff --git a/test/e2e/common/lazyxds-istio-config.yaml b/test/e2e/common/lazyxds-istio-config.yaml deleted file mode 100644 index 3942bc599..000000000 --- a/test/e2e/common/lazyxds-istio-config.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -apiVersion: install.istio.io/v1alpha1 -kind: IstioOperator -spec: - profile: default - meshConfig: - accessLogFile: /dev/stdout - components: - ingressGateways: - - name: istio-ingressgateway - enabled: false - pilot: - k8s: - resources: - requests: - memory: 100Mi - cpu: 100m - hub: istio - tag: 1.12.7 diff --git a/test/e2e/scripts/lazyxds.sh b/test/e2e/scripts/lazyxds.sh deleted file mode 100644 index 5719dac6c..000000000 --- a/test/e2e/scripts/lazyxds.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set -ex -BASEDIR=$(dirname "$0") - -TMP_DIR=$BASEDIR/../tmp - -if [ -z "$BUILD_TAG" ] -then - export BUILD_TAG=`git log --format="%H" -n 1` -fi - -rm -rf $TMP_DIR -mkdir $TMP_DIR -envsubst < $BASEDIR/../common/lazyxds-controller.yaml > $TMP_DIR/lazyxds-controller-tmp.yaml -kubectl apply -f $TMP_DIR/lazyxds-controller-tmp.yaml -kubectl apply -f $BASEDIR/../../../lazyxds/install/lazyxds-egress.yaml -rm -rf $TMP_DIR