jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-04-21 20:17:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Remove redundant building configurations (#224)

Browse Source
This commit is contained in:
Kent Dong
2023-03-03 17:56:50 +08:00
committed by GitHub
parent 39931ab854
commit 7e2c039fc2
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.core.mk
View File

@@ -95,9 +95,6 @@ export PARENT_GIT_REVISION:=$(TAG)
export ENVOY_TAR_PATH:=/home/package/envoy.tar.gz export ENVOY_TAR_PATH:=/home/package/envoy.tar.gz
build-istio: prebuild
cd external/istio; rm -rf out; GOOS_LOCAL=linux TARGET_OS=linux TARGET_ARCH=amd64 BUILD_WITH_CONTAINER=1 DOCKER_BUILD_VARIANTS=default DOCKER_TARGETS="docker.pilot" make docker
external/package/envoy.tar.gz: external/package/envoy.tar.gz:
cd external/proxy; BUILD_WITH_CONTAINER=1 make test_release cd external/proxy; BUILD_WITH_CONTAINER=1 make test_release
@@ -106,16 +103,13 @@ build-gateway: prebuild external/package/envoy.tar.gz
pre-install: pre-install:
cp api/kubernetes/customresourcedefinitions.gen.yaml helm/higress/crds cp api/kubernetes/customresourcedefinitions.gen.yaml helm/higress/crds
cd helm/istio; helm dependency update
cd helm/kind/higress; helm dependency update
cd helm/kind/istio; helm dependency update
define create_ns define create_ns
kubectl get namespace | grep $(1) || kubectl create namespace $(1) kubectl get namespace | grep $(1) || kubectl create namespace $(1)
endef endef
install: pre-install install: pre-install
helm install higress helm/kind/higress -n higress-system --create-namespace helm install higress helm/higress -n higress-system --create-namespace --set-json='global.kind=true'
ENVOY_LATEST_IMAGE_TAG ?= 0.6.0 ENVOY_LATEST_IMAGE_TAG ?= 0.6.0
ISTIO_LATEST_IMAGE_TAG ?= 0.6.0 ISTIO_LATEST_IMAGE_TAG ?= 0.6.0
@@ -127,22 +121,12 @@ uninstall:
helm uninstall higress -n higress-system helm uninstall higress -n higress-system
upgrade: pre-install upgrade: pre-install
helm upgrade higress helm/kind/higress -n higress-system helm upgrade higress helm/higress -n higress-system --set-json='global.kind=true'
helm-push: helm-push:
cp api/kubernetes/customresourcedefinitions.gen.yaml helm/higress/crds cp api/kubernetes/customresourcedefinitions.gen.yaml helm/higress/crds
cd helm; tar -zcf higress.tgz higress; helm push higress.tgz "oci://$(CHARTS)" cd helm; tar -zcf higress.tgz higress; helm push higress.tgz "oci://$(CHARTS)"
helm-push-istio:
cd helm/istio; helm dependency update
cd helm; tar -zcf istio.tgz istio; helm push istio.tgz "oci://$(CHARTS)"
helm-push-kind:
cd helm/kind/higress; helm dependency update
cd helm/kind; tar -zcf higress.tgz higress; helm push higress.tgz "oci://$(CHARTS)"
cd helm/kind/istio; helm dependency update
cd helm/kind; tar -zcf istio.tgz istio; helm push istio.tgz "oci://$(CHARTS)"
cue = cue-gen -paths=./external/api/common-protos cue = cue-gen -paths=./external/api/common-protos
gen-api: prebuild gen-api: prebuild