Skip to content

Commit

Permalink
feat: Remove redundant helm charts and add console as a dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
kentd-trip authored and CH3CHO committed Mar 6, 2023
1 parent 7e2c039 commit 0d42636
Show file tree
Hide file tree
Showing 75 changed files with 27 additions and 16,165 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/deploy-to-oss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:
with:
helmv3: 3.7.2
command: |
helmv3 repo add higress.io https://higress.io/helm-charts
helmv3 package helm/core --debug --app-version ${{steps.calc-version.outputs.version}} --version ${{steps.calc-version.outputs.version}} -d ./artifact
helmv3 dependency build helm/higress
helmv3 package helm/higress --debug --app-version ${{steps.calc-version.outputs.version}} --version ${{steps.calc-version.outputs.version}} -d ./artifact
helmv3 repo index --url https://higress.io/helm-charts/ --merge ./artifact/index.yaml ./artifact
# Step 5
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ bazel-out
bazel-testlogs
bazel-wasm-cpp
tools/bin/
helm/**/charts/**.tgz
10 changes: 5 additions & 5 deletions Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -102,29 +102,29 @@ build-gateway: prebuild external/package/envoy.tar.gz
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.proxyv2" make docker

pre-install:
cp api/kubernetes/customresourcedefinitions.gen.yaml helm/higress/crds
cp api/kubernetes/customresourcedefinitions.gen.yaml helm/core/crds

define create_ns
kubectl get namespace | grep $(1) || kubectl create namespace $(1)
endef

install: pre-install
helm install higress helm/higress -n higress-system --create-namespace --set-json='global.kind=true'
helm install higress helm/core -n higress-system --create-namespace --set-json='global.kind=true'

ENVOY_LATEST_IMAGE_TAG ?= 0.6.0
ISTIO_LATEST_IMAGE_TAG ?= 0.6.0

install-dev: pre-install
helm install higress helm/higress -n higress-system --create-namespace --set-json='controller.tag="$(TAG)"' --set-json='gateway.replicas=1' --set-json='gateway.tag="$(ENVOY_LATEST_IMAGE_TAG)"' --set-json='global.kind=true'
helm install higress helm/core -n higress-system --create-namespace --set-json='controller.tag="$(TAG)"' --set-json='gateway.replicas=1' --set-json='gateway.tag="$(ENVOY_LATEST_IMAGE_TAG)"' --set-json='global.kind=true'

uninstall:
helm uninstall higress -n higress-system

upgrade: pre-install
helm upgrade higress helm/higress -n higress-system --set-json='global.kind=true'
helm upgrade higress helm/core -n higress-system --set-json='global.kind=true'

helm-push:
cp api/kubernetes/customresourcedefinitions.gen.yaml helm/higress/crds
cp api/kubernetes/customresourcedefinitions.gen.yaml helm/core/crds
cd helm; tar -zcf higress.tgz higress; helm push higress.tgz "oci://$(CHARTS)"

cue = cue-gen -paths=./external/api/common-protos
Expand Down
7 changes: 0 additions & 7 deletions helm/base/Chart.yaml

This file was deleted.

Loading

0 comments on commit 0d42636

Please sign in to comment.