Upgrade ks-installer chart to v3.2.0 #191

mangoGoForward · 2021-11-11T06:02:00Z

What this PR dose?

Upgrade ks-installer chart to v3.2.0

What this PR does / why we need it:

please see #190.

Which issue(s) this PR fixes:

Fixes #190.

zheng1 · 2021-11-11T08:26:54Z

/cc @pixiake
/cc @misteruly

pixiake · 2021-11-15T03:12:39Z

Many configurations in the clusterConfiguration have changed.
https://github.com/kubesphere/ks-installer/blob/release-3.2/deploy/cluster-configuration.yaml

I think everything in the spec of clusterConfiguration can be defined as a configurable parameter, so we don't have to consider the configuration changes in it.

mangoGoForward · 2021-11-15T04:42:13Z

Many configurations in the clusterConfiguration have changed. https://github.com/kubesphere/ks-installer/blob/release-3.2/deploy/cluster-configuration.yaml

I think everything in the spec of clusterConfiguration can be defined as a configurable parameter, so we don't have to consider the configuration changes in it.

Do you mean use one parameter spec instead of support detailed configuration items? and do we need verify the spec parameter?

pixiake · 2021-11-16T09:46:14Z

Many configurations in the clusterConfiguration have changed. https://github.com/kubesphere/ks-installer/blob/release-3.2/deploy/cluster-configuration.yaml
I think everything in the spec of clusterConfiguration can be defined as a configurable parameter, so we don't have to consider the configuration changes in it.

Do you mean use one parameter spec instead of support detailed configuration items? and do we need verify the spec parameter?

Yes
The configuration of ks-installer is not a fixed structure, and there are many configuration items, it is not realistic to list each item separately for configuration, so I think it is more flexible to specify the configuration directly with one parameter, such as clusterConfiguration.
How do you like it ?

replicaCount: 1

...

clusterConfiguration:
  persistence:
    storageClass: ""
  authentication:
    jwtSecret: ""  
  local_registry: ""    
  etcd:
    monitoring: false   
    endpointIps: localhost 
    port: 2379  
    tlsEnable: true
  common:
    core:
      console:
        enableMultiLogin: true 
        port: 30880
        type: NodePort
    redis:
      enabled: false
      volumeSize: 2Gi # Redis PVC size.
    openldap:
      enabled: false
      volumeSize: 2Gi   # openldap PVC size.
    minio:
      volumeSize: 20Gi # Minio PVC size.
    monitoring:
      # type: external   # Whether to specify the external prometheus stack, and need to modify the endpoint at the next line.
      endpoint: http://prometheus-operated.kubesphere-monitoring-system.svc:9090 # Prometheus endpoint to get metrics data.
      GPUMonitoring:     # Enable or disable the GPU-related metrics. If you enable this switch but have no GPU resources, Kubesphere will set it to zero. 
        enabled: false
    gpu:                 # Install GPUKinds. The default GPU kind is nvidia.com/gpu. Other GPU kinds can be added here according to your needs. 
      kinds:         
      - resourceName: "nvidia.com/gpu"
        resourceType: "GPU"
        default: true
    es:   # Storage backend for logging, events and auditing.
      # master:
      #   volumeSize: 4Gi  # The volume size of Elasticsearch master nodes.
      #   replicas: 1      # The total number of master nodes. Even numbers are not allowed.
      #   resources: {}
      # data:
      #   volumeSize: 20Gi  # The volume size of Elasticsearch data nodes.
      #   replicas: 1       # The total number of data nodes.
      #   resources: {}
      logMaxAge: 7             # Log retention time in built-in Elasticsearch. It is 7 days by default.
      elkPrefix: logstash      # The string making up index names. The index name will be formatted as ks-<elk_prefix>-log.
      basicAuth:
        enabled: false
        username: ""
        password: ""
      externalElasticsearchHost: ""
      externalElasticsearchPort: ""
  alerting:                # (CPU: 0.1 Core, Memory: 100 MiB) It enables users to customize alerting policies to send messages to receivers in time with different time intervals and alerting levels to choose from.
    enabled: false         # Enable or disable the KubeSphere Alerting System.
    # thanosruler:
    #   replicas: 1
    #   resources: {}
  auditing:                # Provide a security-relevant chronological set of records，recording the sequence of activities happening on the platform, initiated by different tenants.
    enabled: false         # Enable or disable the KubeSphere Auditing Log System.
    # operator:
    #   resources: {}
    # webhook:
    #   resources: {}

mangoGoForward · 2021-11-16T10:15:47Z

Many configurations in the clusterConfiguration have changed. https://github.com/kubesphere/ks-installer/blob/release-3.2/deploy/cluster-configuration.yaml
I think everything in the spec of clusterConfiguration can be defined as a configurable parameter, so we don't have to consider the configuration changes in it.

Do you mean use one parameter spec instead of support detailed configuration items? and do we need verify the spec parameter?

Yes The configuration of ks-installer is not a fixed structure, and there are many configuration items, it is not realistic to list each item separately for configuration, so I think it is more flexible to specify the configuration directly with one parameter, such as clusterConfiguration. How do you like it ?

replicaCount: 1

...

clusterConfiguration:
  persistence:
    storageClass: ""
  authentication:
    jwtSecret: ""  
  local_registry: ""    
  etcd:
    monitoring: false   
    endpointIps: localhost 
    port: 2379  
    tlsEnable: true
  common:
    core:
      console:
        enableMultiLogin: true 
        port: 30880
        type: NodePort
    redis:
      enabled: false
      volumeSize: 2Gi # Redis PVC size.
    openldap:
      enabled: false
      volumeSize: 2Gi   # openldap PVC size.
    minio:
      volumeSize: 20Gi # Minio PVC size.
    monitoring:
      # type: external   # Whether to specify the external prometheus stack, and need to modify the endpoint at the next line.
      endpoint: http://prometheus-operated.kubesphere-monitoring-system.svc:9090 # Prometheus endpoint to get metrics data.
      GPUMonitoring:     # Enable or disable the GPU-related metrics. If you enable this switch but have no GPU resources, Kubesphere will set it to zero. 
        enabled: false
    gpu:                 # Install GPUKinds. The default GPU kind is nvidia.com/gpu. Other GPU kinds can be added here according to your needs. 
      kinds:         
      - resourceName: "nvidia.com/gpu"
        resourceType: "GPU"
        default: true
    es:   # Storage backend for logging, events and auditing.
      # master:
      #   volumeSize: 4Gi  # The volume size of Elasticsearch master nodes.
      #   replicas: 1      # The total number of master nodes. Even numbers are not allowed.
      #   resources: {}
      # data:
      #   volumeSize: 20Gi  # The volume size of Elasticsearch data nodes.
      #   replicas: 1       # The total number of data nodes.
      #   resources: {}
      logMaxAge: 7             # Log retention time in built-in Elasticsearch. It is 7 days by default.
      elkPrefix: logstash      # The string making up index names. The index name will be formatted as ks-<elk_prefix>-log.
      basicAuth:
        enabled: false
        username: ""
        password: ""
      externalElasticsearchHost: ""
      externalElasticsearchPort: ""
  alerting:                # (CPU: 0.1 Core, Memory: 100 MiB) It enables users to customize alerting policies to send messages to receivers in time with different time intervals and alerting levels to choose from.
    enabled: false         # Enable or disable the KubeSphere Alerting System.
    # thanosruler:
    #   replicas: 1
    #   resources: {}
  auditing:                # Provide a security-relevant chronological set of records，recording the sequence of activities happening on the platform, initiated by different tenants.
    enabled: false         # Enable or disable the KubeSphere Auditing Log System.
    # operator:
    #   resources: {}
    # webhook:
    #   resources: {}

It may let user confused about the structure of cluster configuration.

pixiake · 2021-11-16T13:40:36Z

Many configurations in the clusterConfiguration have changed. https://github.com/kubesphere/ks-installer/blob/release-3.2/deploy/cluster-configuration.yaml
I think everything in the spec of clusterConfiguration can be defined as a configurable parameter, so we don't have to consider the configuration changes in it.

Do you mean use one parameter spec instead of support detailed configuration items? and do we need verify the spec parameter?

Yes The configuration of ks-installer is not a fixed structure, and there are many configuration items, it is not realistic to list each item separately for configuration, so I think it is more flexible to specify the configuration directly with one parameter, such as clusterConfiguration. How do you like it ?

replicaCount: 1

...

clusterConfiguration:
  persistence:
    storageClass: ""
  authentication:
    jwtSecret: ""  
  local_registry: ""    
  etcd:
    monitoring: false   
    endpointIps: localhost 
    port: 2379  
    tlsEnable: true
  common:
    core:
      console:
        enableMultiLogin: true 
        port: 30880
        type: NodePort
    redis:
      enabled: false
      volumeSize: 2Gi # Redis PVC size.
    openldap:
      enabled: false
      volumeSize: 2Gi   # openldap PVC size.
    minio:
      volumeSize: 20Gi # Minio PVC size.
    monitoring:
      # type: external   # Whether to specify the external prometheus stack, and need to modify the endpoint at the next line.
      endpoint: http://prometheus-operated.kubesphere-monitoring-system.svc:9090 # Prometheus endpoint to get metrics data.
      GPUMonitoring:     # Enable or disable the GPU-related metrics. If you enable this switch but have no GPU resources, Kubesphere will set it to zero. 
        enabled: false
    gpu:                 # Install GPUKinds. The default GPU kind is nvidia.com/gpu. Other GPU kinds can be added here according to your needs. 
      kinds:         
      - resourceName: "nvidia.com/gpu"
        resourceType: "GPU"
        default: true
    es:   # Storage backend for logging, events and auditing.
      # master:
      #   volumeSize: 4Gi  # The volume size of Elasticsearch master nodes.
      #   replicas: 1      # The total number of master nodes. Even numbers are not allowed.
      #   resources: {}
      # data:
      #   volumeSize: 20Gi  # The volume size of Elasticsearch data nodes.
      #   replicas: 1       # The total number of data nodes.
      #   resources: {}
      logMaxAge: 7             # Log retention time in built-in Elasticsearch. It is 7 days by default.
      elkPrefix: logstash      # The string making up index names. The index name will be formatted as ks-<elk_prefix>-log.
      basicAuth:
        enabled: false
        username: ""
        password: ""
      externalElasticsearchHost: ""
      externalElasticsearchPort: ""
  alerting:                # (CPU: 0.1 Core, Memory: 100 MiB) It enables users to customize alerting policies to send messages to receivers in time with different time intervals and alerting levels to choose from.
    enabled: false         # Enable or disable the KubeSphere Alerting System.
    # thanosruler:
    #   replicas: 1
    #   resources: {}
  auditing:                # Provide a security-relevant chronological set of records，recording the sequence of activities happening on the platform, initiated by different tenants.
    enabled: false         # Enable or disable the KubeSphere Auditing Log System.
    # operator:
    #   resources: {}
    # webhook:
    #   resources: {}

It may let user confused about the structure of cluster configuration.

Otherwise, the template should be modified according to the new configuration. Or do you have any better ideas ?

mangoGoForward · 2021-11-17T01:28:59Z

Many configurations in the clusterConfiguration have changed. https://github.com/kubesphere/ks-installer/blob/release-3.2/deploy/cluster-configuration.yaml
I think everything in the spec of clusterConfiguration can be defined as a configurable parameter, so we don't have to consider the configuration changes in it.

Do you mean use one parameter spec instead of support detailed configuration items? and do we need verify the spec parameter?

Yes The configuration of ks-installer is not a fixed structure, and there are many configuration items, it is not realistic to list each item separately for configuration, so I think it is more flexible to specify the configuration directly with one parameter, such as clusterConfiguration. How do you like it ?

replicaCount: 1

...

clusterConfiguration:
  persistence:
    storageClass: ""
  authentication:
    jwtSecret: ""  
  local_registry: ""    
  etcd:
    monitoring: false   
    endpointIps: localhost 
    port: 2379  
    tlsEnable: true
  common:
    core:
      console:
        enableMultiLogin: true 
        port: 30880
        type: NodePort
    redis:
      enabled: false
      volumeSize: 2Gi # Redis PVC size.
    openldap:
      enabled: false
      volumeSize: 2Gi   # openldap PVC size.
    minio:
      volumeSize: 20Gi # Minio PVC size.
    monitoring:
      # type: external   # Whether to specify the external prometheus stack, and need to modify the endpoint at the next line.
      endpoint: http://prometheus-operated.kubesphere-monitoring-system.svc:9090 # Prometheus endpoint to get metrics data.
      GPUMonitoring:     # Enable or disable the GPU-related metrics. If you enable this switch but have no GPU resources, Kubesphere will set it to zero. 
        enabled: false
    gpu:                 # Install GPUKinds. The default GPU kind is nvidia.com/gpu. Other GPU kinds can be added here according to your needs. 
      kinds:         
      - resourceName: "nvidia.com/gpu"
        resourceType: "GPU"
        default: true
    es:   # Storage backend for logging, events and auditing.
      # master:
      #   volumeSize: 4Gi  # The volume size of Elasticsearch master nodes.
      #   replicas: 1      # The total number of master nodes. Even numbers are not allowed.
      #   resources: {}
      # data:
      #   volumeSize: 20Gi  # The volume size of Elasticsearch data nodes.
      #   replicas: 1       # The total number of data nodes.
      #   resources: {}
      logMaxAge: 7             # Log retention time in built-in Elasticsearch. It is 7 days by default.
      elkPrefix: logstash      # The string making up index names. The index name will be formatted as ks-<elk_prefix>-log.
      basicAuth:
        enabled: false
        username: ""
        password: ""
      externalElasticsearchHost: ""
      externalElasticsearchPort: ""
  alerting:                # (CPU: 0.1 Core, Memory: 100 MiB) It enables users to customize alerting policies to send messages to receivers in time with different time intervals and alerting levels to choose from.
    enabled: false         # Enable or disable the KubeSphere Alerting System.
    # thanosruler:
    #   replicas: 1
    #   resources: {}
  auditing:                # Provide a security-relevant chronological set of records，recording the sequence of activities happening on the platform, initiated by different tenants.
    enabled: false         # Enable or disable the KubeSphere Auditing Log System.
    # operator:
    #   resources: {}
    # webhook:
    #   resources: {}

It may let user confused about the structure of cluster configuration.

Otherwise, the template should be modified according to the new configuration. Or do you have any better ideas ?

I have no idea right now, your suggestion solved synchronization problem with the new cluster configuration in ks-installer, I will refactor code firstly, and if have other great ideas, we can deal with it again.

Signed-off-by: mango <[email protected]>

mangoGoForward · 2021-11-19T06:40:48Z

/hold

Signed-off-by: mango <[email protected]>

mangoGoForward · 2021-11-19T06:58:00Z

/unhold

mangoGoForward · 2021-11-19T07:03:28Z

Hi, I have refactored cc template of ks-installer, could you help me to provide some suggestions? @pixiake

pixiake · 2021-11-20T11:51:31Z

Hi, I have refactored cc template of ks-installer, could you help me to provide some suggestions? @pixiake

helm-charts/src/main/ks-installer/templates/NOTES.txt

Line 2 in c499885

Thanks，I think this place should be changed to cc.common.core.console.port .

Signed-off-by: mango <[email protected]>

mangoGoForward · 2021-11-21T06:27:34Z

Hi, I have refactored cc template of ks-installer, could you help me to provide some suggestions? @pixiake

helm-charts/src/main/ks-installer/templates/NOTES.txt

Line 2 in c499885

{{- if .Values.console.port }}

Thanks，I think this place should be changed to cc.common.core.console.port .

All right, Done.

pixiake · 2021-11-22T08:10:44Z

/lgtm

zheng1 · 2021-11-24T02:06:56Z

@mangoGoForward please update the version in Chart.yaml

Signed-off-by: mango <[email protected]>

mangoGoForward · 2021-11-24T02:30:48Z

@mangoGoForward please update the version in Chart.yaml

Done.

pixiake · 2021-11-24T13:00:20Z

src/main/ks-installer/Chart.yaml

@@ -18,9 +18,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.2
+version: 1.0.0


I think it might be better to change the chart version to 0.3.0.

But this update has changed the Values structure which is incompatible with old version.

Signed-off-by: mango <[email protected]>

pixiake · 2021-11-24T16:33:57Z

/lgtm

pixiake · 2021-11-24T16:47:21Z

@zheng1 I think this pr can be merged，and very grateful to @mangoGoForward for this contribution.

zheng1 · 2021-11-25T05:57:37Z

/approve

ks-ci-bot · 2021-11-25T05:57:43Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mangoGoForward, zheng1

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [zheng1]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

mangoGoForward and others added 2 commits November 11, 2021 13:56

Upgrade ks-installer chart to v3.2.0

1392f9c

Merge branch 'master' into upgrade-ks-installer

65f4e29

ks-ci-bot added the size/S label Nov 11, 2021

ks-ci-bot requested review from misteruly and pixiake November 11, 2021 08:26

refactor: refactor cc template and values.

e3b368e

Signed-off-by: mango <[email protected]>

ks-ci-bot added size/L and removed size/S labels Nov 19, 2021

ks-ci-bot added the do-not-merge/hold label Nov 19, 2021

refactor: refactor cc template, values and update README file.

034150c

Signed-off-by: mango <[email protected]>

ks-ci-bot added size/XL and removed size/L labels Nov 19, 2021

ks-ci-bot removed the do-not-merge/hold label Nov 19, 2021

update ks-installer's notes

cc3630f

Signed-off-by: mango <[email protected]>

ks-ci-bot assigned pixiake Nov 22, 2021

ks-ci-bot added the lgtm label Nov 22, 2021

update chart version to 1.0.0

d360d81

Signed-off-by: mango <[email protected]>

pixiake reviewed Nov 24, 2021

View reviewed changes

update chart version to 0.3.0

4617dc2

Signed-off-by: mango <[email protected]>

ks-ci-bot added size/XXL and removed lgtm size/XL labels Nov 24, 2021

ks-ci-bot added the lgtm label Nov 24, 2021

ks-ci-bot added the approved label Nov 25, 2021

ks-ci-bot merged commit 362a703 into kubesphere:master Nov 25, 2021

mangoGoForward deleted the upgrade-ks-installer branch December 27, 2021 03:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade ks-installer chart to v3.2.0 #191

Upgrade ks-installer chart to v3.2.0 #191

mangoGoForward commented Nov 11, 2021 •

edited

Loading

zheng1 commented Nov 11, 2021

pixiake commented Nov 15, 2021 •

edited

Loading

mangoGoForward commented Nov 15, 2021

pixiake commented Nov 16, 2021

mangoGoForward commented Nov 16, 2021

pixiake commented Nov 16, 2021

mangoGoForward commented Nov 17, 2021 •

edited

Loading

mangoGoForward commented Nov 19, 2021

mangoGoForward commented Nov 19, 2021

mangoGoForward commented Nov 19, 2021

pixiake commented Nov 20, 2021

mangoGoForward commented Nov 21, 2021

pixiake commented Nov 22, 2021

zheng1 commented Nov 24, 2021

mangoGoForward commented Nov 24, 2021

pixiake Nov 24, 2021

mangoGoForward Nov 24, 2021

mangoGoForward Nov 24, 2021

pixiake commented Nov 24, 2021

pixiake commented Nov 24, 2021 •

edited

Loading

zheng1 commented Nov 25, 2021

ks-ci-bot commented Nov 25, 2021

Upgrade ks-installer chart to v3.2.0 #191

Upgrade ks-installer chart to v3.2.0 #191

Conversation

mangoGoForward commented Nov 11, 2021 • edited Loading

What this PR dose?

What this PR does / why we need it:

Which issue(s) this PR fixes:

zheng1 commented Nov 11, 2021

pixiake commented Nov 15, 2021 • edited Loading

mangoGoForward commented Nov 15, 2021

pixiake commented Nov 16, 2021

mangoGoForward commented Nov 16, 2021

pixiake commented Nov 16, 2021

mangoGoForward commented Nov 17, 2021 • edited Loading

mangoGoForward commented Nov 19, 2021

mangoGoForward commented Nov 19, 2021

mangoGoForward commented Nov 19, 2021

pixiake commented Nov 20, 2021

mangoGoForward commented Nov 21, 2021

pixiake commented Nov 22, 2021

zheng1 commented Nov 24, 2021

mangoGoForward commented Nov 24, 2021

pixiake Nov 24, 2021

Choose a reason for hiding this comment

mangoGoForward Nov 24, 2021

Choose a reason for hiding this comment

mangoGoForward Nov 24, 2021

Choose a reason for hiding this comment

pixiake commented Nov 24, 2021

pixiake commented Nov 24, 2021 • edited Loading

zheng1 commented Nov 25, 2021

ks-ci-bot commented Nov 25, 2021

mangoGoForward commented Nov 11, 2021 •

edited

Loading

pixiake commented Nov 15, 2021 •

edited

Loading

mangoGoForward commented Nov 17, 2021 •

edited

Loading

pixiake commented Nov 24, 2021 •

edited

Loading