Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove lazyxds #216

Merged
merged 2 commits into from
May 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
31 changes: 0 additions & 31 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 12 additions & 16 deletions demo/common_func.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
83 changes: 0 additions & 83 deletions test/e2e/common/lazyxds-controller.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions test/e2e/common/lazyxds-istio-config.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions test/e2e/scripts/lazyxds.sh

This file was deleted.