This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shardingsphere-on-cloud.git
The following commit(s) were added to refs/heads/main by this push:
new 404449f chore(charts): fix charts name; fix docker images build
ci,image name;
new c00d4f1 Merge pull request #101 from windghoul/fix
404449f is described below
commit 404449f764daad1038ef9f76a8ec1f7c2b84d51f
Author: windghoul <[email protected]>
AuthorDate: Mon Oct 24 15:22:57 2022 +0800
chore(charts): fix charts name; fix docker images build ci,image name;
Signed-off-by: windghoul <[email protected]>
---
.github/workflows/build.yaml | 3 ++-
.gitignore | 4 ++--
.licenserc.yaml | 3 ++-
.../.helmignore | 0
.../Chart.yaml | 0
.../LICENSE | 0
.../NOTICE | 0
.../crds/shardingsphere.apache.org_shardingsphereproxies.yaml | 0
.../shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml | 0
.../templates/deployment.yaml | 0
.../templates/rbac.yaml | 0
.../templates/webhook/admission-webhook-apiservice.yaml | 0
.../templates/webhook/admission-webhook-configuration.yaml | 0
.../templates/webhook/admission-webhook-service.yaml | 0
.../values.yaml | 4 ++--
.../.helmignore | 0
.../Chart.yaml | 0
.../LICENSE | 0
.../NOTICE | 0
.../templates/shardingsphere_v1alpha1_shardingsphereproxy.yaml | 0
.../shardingsphere_v1alpha1_shardingsphereproxyserverconfig.yaml | 0
.../values.yaml | 0
.../Chart.yaml | 0
.../LICENSE | 0
.../NOTICE | 0
.../charts/governance/Chart.yaml | 0
.../charts/governance/values.yaml | 0
.../templates/configmap.yaml | 0
.../templates/deployment.yaml | 0
.../templates/service.yaml | 0
.../values.yaml | 0
31 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 68f56ef..271bc2e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,9 +24,10 @@ on:
- release**
- main
tags:
+ - v**
env:
REGISTRY: ghcr.io
- IMAGE_NAME: ${{ github.repository }}
+ IMAGE_NAME: ${{ github.repository }}/apache-shardingsphere-operator
jobs:
build-and-push-image:
diff --git a/.gitignore b/.gitignore
index 59fb949..b2b4e7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,6 @@ testbin/*
*~
shardingsphere-operator/build/certs/
shardingsphere-operator/config/
-charts/shardingsphere-operator-cluster/charts/
-charts/shardingsphere-operator/charts/
+charts/apache-shardingsphere-operator-cluster-charts/charts/
+charts/apache-shardingsphere-operator-charts/charts/
**/Chart.lock
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 591f14b..9db2313 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -27,7 +27,8 @@ header:
- 'docs/**'
- '**/*.md'
- '**/.helmignore'
- - 'LICENSE'
+ - '**/LICENSE'
+ - '**/NOTICE'
- '**/*.toml'
- '**/Makefile'
- 'shardingsphere-operator/PROJECT'
diff --git a/charts/shardingsphere-operator-cluster/.helmignore
b/charts/apache-shardingsphere-operator-charts/.helmignore
similarity index 100%
rename from charts/shardingsphere-operator-cluster/.helmignore
rename to charts/apache-shardingsphere-operator-charts/.helmignore
diff --git a/charts/shardingsphere-operator/Chart.yaml
b/charts/apache-shardingsphere-operator-charts/Chart.yaml
similarity index 100%
rename from charts/shardingsphere-operator/Chart.yaml
rename to charts/apache-shardingsphere-operator-charts/Chart.yaml
diff --git a/charts/shardingsphere-operator-cluster/LICENSE
b/charts/apache-shardingsphere-operator-charts/LICENSE
similarity index 100%
rename from charts/shardingsphere-operator-cluster/LICENSE
rename to charts/apache-shardingsphere-operator-charts/LICENSE
diff --git a/charts/shardingsphere-operator-cluster/NOTICE
b/charts/apache-shardingsphere-operator-charts/NOTICE
similarity index 100%
rename from charts/shardingsphere-operator-cluster/NOTICE
rename to charts/apache-shardingsphere-operator-charts/NOTICE
diff --git
a/charts/shardingsphere-operator/crds/shardingsphere.apache.org_shardingsphereproxies.yaml
b/charts/apache-shardingsphere-operator-charts/crds/shardingsphere.apache.org_shardingsphereproxies.yaml
similarity index 100%
rename from
charts/shardingsphere-operator/crds/shardingsphere.apache.org_shardingsphereproxies.yaml
rename to
charts/apache-shardingsphere-operator-charts/crds/shardingsphere.apache.org_shardingsphereproxies.yaml
diff --git
a/charts/shardingsphere-operator/crds/shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml
b/charts/apache-shardingsphere-operator-charts/crds/shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml
similarity index 100%
rename from
charts/shardingsphere-operator/crds/shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml
rename to
charts/apache-shardingsphere-operator-charts/crds/shardingsphere.apache.org_shardingsphereproxyserverconfigs.yaml
diff --git a/charts/shardingsphere-operator/templates/deployment.yaml
b/charts/apache-shardingsphere-operator-charts/templates/deployment.yaml
similarity index 100%
rename from charts/shardingsphere-operator/templates/deployment.yaml
rename to charts/apache-shardingsphere-operator-charts/templates/deployment.yaml
diff --git a/charts/shardingsphere-operator/templates/rbac.yaml
b/charts/apache-shardingsphere-operator-charts/templates/rbac.yaml
similarity index 100%
rename from charts/shardingsphere-operator/templates/rbac.yaml
rename to charts/apache-shardingsphere-operator-charts/templates/rbac.yaml
diff --git
a/charts/shardingsphere-operator/templates/webhook/admission-webhook-apiservice.yaml
b/charts/apache-shardingsphere-operator-charts/templates/webhook/admission-webhook-apiservice.yaml
similarity index 100%
rename from
charts/shardingsphere-operator/templates/webhook/admission-webhook-apiservice.yaml
rename to
charts/apache-shardingsphere-operator-charts/templates/webhook/admission-webhook-apiservice.yaml
diff --git
a/charts/shardingsphere-operator/templates/webhook/admission-webhook-configuration.yaml
b/charts/apache-shardingsphere-operator-charts/templates/webhook/admission-webhook-configuration.yaml
similarity index 100%
rename from
charts/shardingsphere-operator/templates/webhook/admission-webhook-configuration.yaml
rename to
charts/apache-shardingsphere-operator-charts/templates/webhook/admission-webhook-configuration.yaml
diff --git
a/charts/shardingsphere-operator/templates/webhook/admission-webhook-service.yaml
b/charts/apache-shardingsphere-operator-charts/templates/webhook/admission-webhook-service.yaml
similarity index 100%
rename from
charts/shardingsphere-operator/templates/webhook/admission-webhook-service.yaml
rename to
charts/apache-shardingsphere-operator-charts/templates/webhook/admission-webhook-service.yaml
diff --git a/charts/shardingsphere-operator/values.yaml
b/charts/apache-shardingsphere-operator-charts/values.yaml
similarity index 93%
rename from charts/shardingsphere-operator/values.yaml
rename to charts/apache-shardingsphere-operator-charts/values.yaml
index d80dcd3..3c267a7 100644
--- a/charts/shardingsphere-operator/values.yaml
+++ b/charts/apache-shardingsphere-operator-charts/values.yaml
@@ -22,13 +22,13 @@ replicaCount: 2
image:
## @param image.repository operator image name
##
- repository: "ghcr.io/apache/shardingsphere-on-cloud"
+ repository:
"ghcr.io/apache/shardingsphere-on-cloud/apache-shardingsphere-operator"
## @param image.pullPolicy image pull policy
##
pullPolicy: IfNotPresent
## @param image.tag image tag
##
- tag: "main"
+ tag: "v0.1.0"
## @param imagePullSecrets image pull secret of private repository
## e.g:
## imagePullSecrets:
diff --git a/charts/shardingsphere-operator/.helmignore
b/charts/apache-shardingsphere-operator-cluster-charts/.helmignore
similarity index 100%
rename from charts/shardingsphere-operator/.helmignore
rename to charts/apache-shardingsphere-operator-cluster-charts/.helmignore
diff --git a/charts/shardingsphere-operator-cluster/Chart.yaml
b/charts/apache-shardingsphere-operator-cluster-charts/Chart.yaml
similarity index 100%
rename from charts/shardingsphere-operator-cluster/Chart.yaml
rename to charts/apache-shardingsphere-operator-cluster-charts/Chart.yaml
diff --git a/charts/shardingsphere-operator/LICENSE
b/charts/apache-shardingsphere-operator-cluster-charts/LICENSE
similarity index 100%
rename from charts/shardingsphere-operator/LICENSE
rename to charts/apache-shardingsphere-operator-cluster-charts/LICENSE
diff --git a/charts/shardingsphere-operator/NOTICE
b/charts/apache-shardingsphere-operator-cluster-charts/NOTICE
similarity index 100%
rename from charts/shardingsphere-operator/NOTICE
rename to charts/apache-shardingsphere-operator-cluster-charts/NOTICE
diff --git
a/charts/shardingsphere-operator-cluster/templates/shardingsphere_v1alpha1_shardingsphereproxy.yaml
b/charts/apache-shardingsphere-operator-cluster-charts/templates/shardingsphere_v1alpha1_shardingsphereproxy.yaml
similarity index 100%
rename from
charts/shardingsphere-operator-cluster/templates/shardingsphere_v1alpha1_shardingsphereproxy.yaml
rename to
charts/apache-shardingsphere-operator-cluster-charts/templates/shardingsphere_v1alpha1_shardingsphereproxy.yaml
diff --git
a/charts/shardingsphere-operator-cluster/templates/shardingsphere_v1alpha1_shardingsphereproxyserverconfig.yaml
b/charts/apache-shardingsphere-operator-cluster-charts/templates/shardingsphere_v1alpha1_shardingsphereproxyserverconfig.yaml
similarity index 100%
rename from
charts/shardingsphere-operator-cluster/templates/shardingsphere_v1alpha1_shardingsphereproxyserverconfig.yaml
rename to
charts/apache-shardingsphere-operator-cluster-charts/templates/shardingsphere_v1alpha1_shardingsphereproxyserverconfig.yaml
diff --git a/charts/shardingsphere-operator-cluster/values.yaml
b/charts/apache-shardingsphere-operator-cluster-charts/values.yaml
similarity index 100%
rename from charts/shardingsphere-operator-cluster/values.yaml
rename to charts/apache-shardingsphere-operator-cluster-charts/values.yaml
diff --git a/charts/shardingsphere-proxy/Chart.yaml
b/charts/apache-shardingsphere-proxy-charts/Chart.yaml
similarity index 100%
rename from charts/shardingsphere-proxy/Chart.yaml
rename to charts/apache-shardingsphere-proxy-charts/Chart.yaml
diff --git a/charts/shardingsphere-proxy/LICENSE
b/charts/apache-shardingsphere-proxy-charts/LICENSE
similarity index 100%
rename from charts/shardingsphere-proxy/LICENSE
rename to charts/apache-shardingsphere-proxy-charts/LICENSE
diff --git a/charts/shardingsphere-proxy/NOTICE
b/charts/apache-shardingsphere-proxy-charts/NOTICE
similarity index 100%
rename from charts/shardingsphere-proxy/NOTICE
rename to charts/apache-shardingsphere-proxy-charts/NOTICE
diff --git a/charts/shardingsphere-proxy/charts/governance/Chart.yaml
b/charts/apache-shardingsphere-proxy-charts/charts/governance/Chart.yaml
similarity index 100%
rename from charts/shardingsphere-proxy/charts/governance/Chart.yaml
rename to charts/apache-shardingsphere-proxy-charts/charts/governance/Chart.yaml
diff --git a/charts/shardingsphere-proxy/charts/governance/values.yaml
b/charts/apache-shardingsphere-proxy-charts/charts/governance/values.yaml
similarity index 100%
rename from charts/shardingsphere-proxy/charts/governance/values.yaml
rename to
charts/apache-shardingsphere-proxy-charts/charts/governance/values.yaml
diff --git a/charts/shardingsphere-proxy/templates/configmap.yaml
b/charts/apache-shardingsphere-proxy-charts/templates/configmap.yaml
similarity index 100%
rename from charts/shardingsphere-proxy/templates/configmap.yaml
rename to charts/apache-shardingsphere-proxy-charts/templates/configmap.yaml
diff --git a/charts/shardingsphere-proxy/templates/deployment.yaml
b/charts/apache-shardingsphere-proxy-charts/templates/deployment.yaml
similarity index 100%
rename from charts/shardingsphere-proxy/templates/deployment.yaml
rename to charts/apache-shardingsphere-proxy-charts/templates/deployment.yaml
diff --git a/charts/shardingsphere-proxy/templates/service.yaml
b/charts/apache-shardingsphere-proxy-charts/templates/service.yaml
similarity index 100%
rename from charts/shardingsphere-proxy/templates/service.yaml
rename to charts/apache-shardingsphere-proxy-charts/templates/service.yaml
diff --git a/charts/shardingsphere-proxy/values.yaml
b/charts/apache-shardingsphere-proxy-charts/values.yaml
similarity index 100%
rename from charts/shardingsphere-proxy/values.yaml
rename to charts/apache-shardingsphere-proxy-charts/values.yaml
