diff --git a/.asf.yaml b/.asf.yaml index 4bf47b4d3..bf563f92e 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -15,7 +15,5 @@ github: protected_branches: - master: + develop: foo: bar - master-0.2.0: - foo: bar \ No newline at end of file diff --git a/deploy/charts/nacos/README.md b/deploy/charts/nacos/README.md index bf24ece78..f11352175 100644 --- a/deploy/charts/nacos/README.md +++ b/deploy/charts/nacos/README.md @@ -55,39 +55,57 @@ curl -X GET "http://$NODE_IP:$NODE_PORT/nacos/v1/cs/configs?dataId=nacos.cfg.dat The following table lists the configurable parameters of the Skywalking chart and their default values. -| Parameter | Description | Default | -|---------------------------------------|--------------------------------------------------------------------|-------------------------------------| -| `global.mode` | Run Mode (~~quickstart,~~ standalone, cluster; ) | `standalone` | -| `resources` | The [resources] to allocate for nacos container | `{}` | -| `nodeSelector` | Nacos labels for pod assignment | `{}` | -| `affinity` | Nacos affinity policy | `{}` | -| `tolerations` | Nacos tolerations | `{}` | -| `resources.requests.cpu`|nacos requests cpu resource|`500m`| -| `resources.requests.memory`|nacos requests memory resource|`2G`| -| `nacos.replicaCount` | Number of desired nacos pods, the number should be 1 as run standalone mode| `1` | -| `nacos.image.repository` | Nacos container image name | `nacos/nacos-server` | -| `nacos.image.tag` | Nacos container image tag | `latest` | -| `nacos.image.pullPolicy` | Nacos container image pull policy | `IfNotPresent` | -| `nacos.plugin.enable` | Nacos cluster plugin that is auto scale | `true` | -| `nacos.plugin.image.repository` | Nacos cluster plugin image name | `nacos/nacos-peer-finder-plugin` | -| `nacos.plugin.image.tag` | Nacos cluster plugin image tag | `1.1` | -| `nacos.health.enabled` | Enable health check or not | `false` | -| `nacos.env.preferhostmode` | Enable Nacos cluster node domain name support | `hostname` | -| `nacos.env.serverPort` | Nacos port | `8848` | -| `nacos.storage.type` | Nacos data storage method `mysql` or `embedded`. The `embedded` supports either standalone or cluster mode | `embedded` | -| `nacos.storage.db.host` | mysql host | | -| `nacos.storage.db.name` | mysql database name | | -| `nacos.storage.db.port` | mysql port | 3306 | -| `nacos.storage.db.username` | username of database | | -| `nacos.storage.db.password` | password of database | | -| `nacos.storage.db.param` | Database url parameter | `characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false` | -| `persistence.enabled` | Enable the nacos data persistence or not | `false` | -| `persistence.data.accessModes` | Nacos data pvc access mode | `ReadWriteOnce` | -| `persistence.data.storageClassName` | Nacos data pvc storage class name | `manual` | -| `persistence.data.resources.requests.storage` | Nacos data pvc requests storage | `5G` | -| `service.type` | http service type | `NodePort` | -| `service.port` | http service port | `8848` | -| `service.nodePort` | http service nodeport | `30000` | -| `ingress.enabled` | Enable ingress or not | `false` | -| `ingress.annotations` | The annotations used in ingress | `{}` | -| `ingress.hosts` | The host of nacos service in ingress rule | `nacos.example.com` | +| Parameter | Description | Default | +|------------------------------|--------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------| +| `global.mode` | Nacos Mode standalone or cluster. | `standalone` | +| `nodeSelector` | Nacos labels for pod assignment. | `{}` | +| `affinity` | Nacos affinity policy. | `{}` | +| `tolerations` | Nacos tolerations. | `{}` | +| `replicas` | Number of desired nacos pods, the number should be 1 as run standalone mode. | `1` | +| `maxUnavailable` | The parameter for specifying the maximum allowed number of unavailable replicas. | `[]` | +| `tolerations` | allow pods to be scheduled on nodes with specific taints by tolerating those taints. | `[]` | +| `domainName` | Enable Nacos cluster node domain name support. | `cluster.local` | +| `resources.limits` | Resource Object Limits. | `{}` | +| `resources.requests` | Resource Object Requests. | `{}` | +| `image.registry` | Nacos container image registry. | `nacos/nacos-server` | +| `image.repository` | Nacos container image repository. | `nacos/nacos-server` | +| `image.tag` | Nacos container image tag. | `latest` | +| `image.pullPolicy` | Nacos container image pull policy. | `IfNotPresent` | +| `plugin.enabled` | Nacos cluster plugin that is auto scale. | `true` | +| `plugin.image.repository` | Nacos cluster plugin image name. | `nacos/nacos-peer-finder-plugin` | +| `plugin.image.tag` | Nacos cluster plugin image tag. | `1.1` | +| `plugin.image.pullPolicy` | Nacos cluster plugin image pull policy. | `IfNotPresent` | +| `health.enabled` | Enable health check or not. | `false` | +| `env.preferhostmode` | Nacos env Preferred Host Mode. | `hostname` | +| `env.serverPort` | Nacos env Server Port. | `8848` | +| `storage.type` | Nacos storage method `mysql` or `embedded`. The `embedded` supports either standalone or cluster mode. | `embedded` | +| `storage.db.host` | Nacos Mysql storage host. | `""` | +| `storage.db.name` | Nacos Mysql storage database name. | `""` | +| `storage.db.port` | Nacos Mysql storage port. | `3306` | +| `storage.db.username` | Username of database. | `""` | +| `storage.db.password` | Password of database. | `""` | +| `storage.db.param` | Database url parameter. | `characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false` | +| `persistence.enabled` | Enable or disable persistence functionality. | `false` | +| `persistence.accessModes` | Defining Access Patterns for Persistent Storage Volume. | `ReadWriteOnce` | +| `persistence.storageClassName` | Defines the type or class of persistent storage volume. | `manual` | +| `persistence.size` | Defines the size of the Kubernetes persistent storage volume. | `5G` | +| `persistence.ClaimName` | Define the name of the persistence store declaration to bind to. | `{}` | +| `persistence.emptyDir` | Configuration for creating a temporary blank directory. | `{}` | +| `podDisruptionBudget.enabled` | Enable or disable podDisruptionBudget functionality. | `false` | +| `podDisruptionBudget.minAvailable` | Defines the minimum number of available Pods that must be maintained in a Kubernetes cluster. | `1` | +| `podDisruptionBudget.maxUnavailable` | Defines the maximum number of available Pods that must be maintained in a Kubernetes cluster. | `1` | +| `service.type` | Nacos http service type. | `NodePort` | +| `service.port` | Nacos http service port. | `8848` | +| `service.nodePort` | Nacos http service nodeport. | `30000` | +| `ingress.enabled` | Enable or disable ingress functionality. | `false` | +| `ingress.annotations` | Adding additional configuration and metadata information to ingress. | `{}` | +| `ingress.labels` | Add custom labels for Ingress objects. | `{}` | +| `ingress.hosts` | The host of nacos service in ingress rule. | `nacos.example.com` | +| `ingress.path` | Ingress defines mapping rules between request paths and backend services. | `/` | +| `ingress.pathType` | Ingress specifies the type of request path matching. | `Prefix` | +| `ingress.extraPaths` | Ingress defines mapping rules between request extra paths and backend services. | `[]` | +| `ingress.tls` | Configure TLS certificate information for encrypted connections received through Ingress objects. | `[]` | +| `networkPolicy.enabled` | Enable or disable networkpolicy functionality. | `false` | +| `networkPolicy.ingress` | Enable or disable networkpolicy ingress. | `true` | +| `networkPolicy.egress.enabled` | Enable or disable networkpolicy egress. | `false` | +| `networkPolicy.egress.ports` | Enable or disable networkpolicy egress ports. | `80` | \ No newline at end of file diff --git a/deploy/charts/nacos/values.yaml b/deploy/charts/nacos/values.yaml index f0437d328..0f18e9818 100644 --- a/deploy/charts/nacos/values.yaml +++ b/deploy/charts/nacos/values.yaml @@ -19,14 +19,13 @@ global: image: registry: docker.io - # e.g registry.k8s.io + # registry: registry.k8s.io repository: nacos/nacos-server tag: latest pullPolicy: IfNotPresent plugin: - enable: true - # true or false + enabled: true image: repository: nacos/nacos-peer-finder-plugin tag: 1.1 @@ -50,15 +49,19 @@ resources: limits: {} requests: {} +env: + preferhostmode: hostname + serverPort: 8848 + storage: type: ~ - # db: + # db: # host: localhost # name: nacos # port: 3306 # username: usernmae # password: password - # param: characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false + # param: characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false service: name: http @@ -100,7 +103,6 @@ persistence: storageClassName: "" size: 5Gi ClaimName: {} - ## persistence emptyDir emptyDir: {} ## See `kubectl explain poddisruptionbudget.spec` for more @@ -178,4 +180,4 @@ networkPolicy: ## E.X. ## ports: ## - port: 80 - ## - port: 443 \ No newline at end of file + ## - port: 443 \ No newline at end of file diff --git a/dubbo-admin-ui/yarn.lock b/dubbo-admin-ui/yarn.lock index 9730b57ec..ac437731d 100644 --- a/dubbo-admin-ui/yarn.lock +++ b/dubbo-admin-ui/yarn.lock @@ -7548,19 +7548,19 @@ selfsigned@^2.1.1: node-forge "^1" "semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0: - version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + version "6.3.1" + resolved "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8: - version "7.5.1" - resolved "https://registry.npmmirror.com/semver/-/semver-7.5.1.tgz" - integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== + version "7.5.4" + resolved "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -8221,9 +8221,9 @@ totalist@^1.0.0: integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== tough-cookie@^4.0.0: - version "4.1.2" - resolved "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-4.1.2.tgz" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + version "4.1.3" + resolved "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== dependencies: psl "^1.1.33" punycode "^2.1.1" @@ -8844,9 +8844,9 @@ wildcard@^2.0.0: integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + version "1.2.5" + resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== wrap-ansi@^3.0.1: version "3.0.1"