diff --git a/.github/workflows/release-chart.yaml b/.github/workflows/release-chart.yaml index 756595ebf5a..2bced16c179 100644 --- a/.github/workflows/release-chart.yaml +++ b/.github/workflows/release-chart.yaml @@ -2,10 +2,9 @@ name: Release Charts on: push: - branches: - - master + tags: + - v* -permissions: {} jobs: release: permissions: @@ -16,20 +15,17 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - fetch-depth: 1 + fetch-depth: 0 - name: Configure Git run: | git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - - name: Install Helm - uses: azure/setup-helm@v3 - - name: Run chart-releaser uses: helm/chart-releaser-action@v1.6.0 with: - charts_dir: charts - config: cr.yaml + skip_existing: true + packages_with_index: true env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/Makefile b/Makefile index c293219d583..74b233958cf 100644 --- a/Makefile +++ b/Makefile @@ -435,7 +435,7 @@ kind-install-chart: kind-load-image kind-untaint-control-plane kubectl label node -lnode-role.kubernetes.io/control-plane kube-ovn/role=master --overwrite kubectl label node -lovn.kubernetes.io/ovs_dp_type!=userspace ovn.kubernetes.io/ovs_dp_type=kernel --overwrite ips=$$(kubectl get node -lkube-ovn/role=master --no-headers -o wide | awk '{print $$6}' | tr '\n' ',' | sed 's/,$$//') && \ - helm install kubeovn ./charts \ + helm install kubeovn ./charts/kube-ovn \ --set global.images.kubeovn.tag=$(VERSION) \ --set replicaCount=$$(echo $$ips | awk -F ',' '{print NF}') \ --set MASTER_NODES="$$(echo $$ips | sed 's/,/\\,/g')" \ @@ -450,7 +450,7 @@ kind-install-chart: kind-load-image kind-untaint-control-plane .PHONY: kind-upgrade-chart kind-upgrade-chart: kind-load-image $(eval OVN_DB_IPS = $(shell kubectl get node -lkube-ovn/role=master --no-headers -o wide | awk '{print $$6}' | tr '\n' ',' | sed -e 's/,$$//' -e 's/,/\\,/g')) - helm upgrade kubeovn ./charts \ + helm upgrade kubeovn ./charts/kube-ovn \ --set global.images.kubeovn.tag=$(VERSION) \ --set replicaCount=$$(echo $(OVN_DB_IPS) | awk -F ',' '{print NF}') \ --set MASTER_NODES='$(OVN_DB_IPS)' \ diff --git a/charts/Chart.yaml b/charts/kube-ovn/Chart.yaml similarity index 100% rename from charts/Chart.yaml rename to charts/kube-ovn/Chart.yaml diff --git a/charts/README.md b/charts/kube-ovn/README.md similarity index 59% rename from charts/README.md rename to charts/kube-ovn/README.md index bd0d5c6c4aa..784df20bf2e 100644 --- a/charts/README.md +++ b/charts/kube-ovn/README.md @@ -10,11 +10,11 @@ $ kubectl label node -lnode-role.kubernetes.io/control-plane kube-ovn/role=mast $ kubectl label node -lovn.kubernetes.io/ovs_dp_type!=userspace ovn.kubernetes.io/ovs_dp_type=kernel --overwrite # standard install -$ helm install --debug kubeovn ./charts --set MASTER_NODES=${Node0}, +$ helm install --debug kubeovn ./charts/kube-ovn --set MASTER_NODES=${Node0} # high availability install -$ helm install --debug kubeovn ./charts --set MASTER_NODES=${Node0},${Node1},${Node2}, --set replicaCount=3 +$ helm install --debug kubeovn ./charts/kube-ovn --set MASTER_NODES=${Node0},${Node1},${Node2} --set replicaCount=3 # upgrade to this version -$ helm upgrade --debug kubeovn ./charts --set MASTER_NODES=${Node0},${Node1},${Node2}, --set replicaCount=3 +$ helm upgrade --debug kubeovn ./charts/kube-ovn --set MASTER_NODES=${Node0},${Node1},${Node2} --set replicaCount=3 ``` diff --git a/charts/templates/_helpers.tpl b/charts/kube-ovn/templates/_helpers.tpl similarity index 100% rename from charts/templates/_helpers.tpl rename to charts/kube-ovn/templates/_helpers.tpl diff --git a/charts/templates/central-deploy.yaml b/charts/kube-ovn/templates/central-deploy.yaml similarity index 100% rename from charts/templates/central-deploy.yaml rename to charts/kube-ovn/templates/central-deploy.yaml diff --git a/charts/templates/controller-deploy.yaml b/charts/kube-ovn/templates/controller-deploy.yaml similarity index 100% rename from charts/templates/controller-deploy.yaml rename to charts/kube-ovn/templates/controller-deploy.yaml diff --git a/charts/templates/controller-svc.yaml b/charts/kube-ovn/templates/controller-svc.yaml similarity index 100% rename from charts/templates/controller-svc.yaml rename to charts/kube-ovn/templates/controller-svc.yaml diff --git a/charts/templates/ic-controller-deploy.yaml b/charts/kube-ovn/templates/ic-controller-deploy.yaml similarity index 100% rename from charts/templates/ic-controller-deploy.yaml rename to charts/kube-ovn/templates/ic-controller-deploy.yaml diff --git a/charts/templates/kube-ovn-crd.yaml b/charts/kube-ovn/templates/kube-ovn-crd.yaml similarity index 100% rename from charts/templates/kube-ovn-crd.yaml rename to charts/kube-ovn/templates/kube-ovn-crd.yaml diff --git a/charts/templates/monitor-deploy.yaml b/charts/kube-ovn/templates/monitor-deploy.yaml similarity index 100% rename from charts/templates/monitor-deploy.yaml rename to charts/kube-ovn/templates/monitor-deploy.yaml diff --git a/charts/templates/monitor-svc.yaml b/charts/kube-ovn/templates/monitor-svc.yaml similarity index 100% rename from charts/templates/monitor-svc.yaml rename to charts/kube-ovn/templates/monitor-svc.yaml diff --git a/charts/templates/nb-svc.yaml b/charts/kube-ovn/templates/nb-svc.yaml similarity index 100% rename from charts/templates/nb-svc.yaml rename to charts/kube-ovn/templates/nb-svc.yaml diff --git a/charts/templates/northd-svc.yaml b/charts/kube-ovn/templates/northd-svc.yaml similarity index 100% rename from charts/templates/northd-svc.yaml rename to charts/kube-ovn/templates/northd-svc.yaml diff --git a/charts/templates/ovn-CR.yaml b/charts/kube-ovn/templates/ovn-CR.yaml similarity index 100% rename from charts/templates/ovn-CR.yaml rename to charts/kube-ovn/templates/ovn-CR.yaml diff --git a/charts/templates/ovn-CRB.yaml b/charts/kube-ovn/templates/ovn-CRB.yaml similarity index 100% rename from charts/templates/ovn-CRB.yaml rename to charts/kube-ovn/templates/ovn-CRB.yaml diff --git a/charts/templates/ovn-dpdk-ds.yaml b/charts/kube-ovn/templates/ovn-dpdk-ds.yaml similarity index 100% rename from charts/templates/ovn-dpdk-ds.yaml rename to charts/kube-ovn/templates/ovn-dpdk-ds.yaml diff --git a/charts/templates/ovn-sa.yaml b/charts/kube-ovn/templates/ovn-sa.yaml similarity index 100% rename from charts/templates/ovn-sa.yaml rename to charts/kube-ovn/templates/ovn-sa.yaml diff --git a/charts/templates/ovncni-ds.yaml b/charts/kube-ovn/templates/ovncni-ds.yaml similarity index 100% rename from charts/templates/ovncni-ds.yaml rename to charts/kube-ovn/templates/ovncni-ds.yaml diff --git a/charts/templates/ovncni-svc.yaml b/charts/kube-ovn/templates/ovncni-svc.yaml similarity index 100% rename from charts/templates/ovncni-svc.yaml rename to charts/kube-ovn/templates/ovncni-svc.yaml diff --git a/charts/templates/ovsovn-ds.yaml b/charts/kube-ovn/templates/ovsovn-ds.yaml similarity index 100% rename from charts/templates/ovsovn-ds.yaml rename to charts/kube-ovn/templates/ovsovn-ds.yaml diff --git a/charts/templates/pinger-ds.yaml b/charts/kube-ovn/templates/pinger-ds.yaml similarity index 100% rename from charts/templates/pinger-ds.yaml rename to charts/kube-ovn/templates/pinger-ds.yaml diff --git a/charts/templates/pinger-svc.yaml b/charts/kube-ovn/templates/pinger-svc.yaml similarity index 100% rename from charts/templates/pinger-svc.yaml rename to charts/kube-ovn/templates/pinger-svc.yaml diff --git a/charts/templates/pre-delete-hook.yaml b/charts/kube-ovn/templates/pre-delete-hook.yaml similarity index 100% rename from charts/templates/pre-delete-hook.yaml rename to charts/kube-ovn/templates/pre-delete-hook.yaml diff --git a/charts/templates/sb-svc.yaml b/charts/kube-ovn/templates/sb-svc.yaml similarity index 100% rename from charts/templates/sb-svc.yaml rename to charts/kube-ovn/templates/sb-svc.yaml diff --git a/charts/templates/upgrade-ovs-ovn.yaml b/charts/kube-ovn/templates/upgrade-ovs-ovn.yaml similarity index 100% rename from charts/templates/upgrade-ovs-ovn.yaml rename to charts/kube-ovn/templates/upgrade-ovs-ovn.yaml diff --git a/charts/templates/vpc-nat-config.yaml b/charts/kube-ovn/templates/vpc-nat-config.yaml similarity index 100% rename from charts/templates/vpc-nat-config.yaml rename to charts/kube-ovn/templates/vpc-nat-config.yaml diff --git a/charts/values.yaml b/charts/kube-ovn/values.yaml similarity index 100% rename from charts/values.yaml rename to charts/kube-ovn/values.yaml diff --git a/cr.yaml b/cr.yaml deleted file mode 100644 index 0e3201dd6ca..00000000000 --- a/cr.yaml +++ /dev/null @@ -1 +0,0 @@ -sign: false