Skip to content

Commit

Permalink
Merge pull request #167 from bjwswang/main
Browse files Browse the repository at this point in the history
chore: use kubebb as the cluster component image repo
  • Loading branch information
bjwswang authored Feb 26, 2024
2 parents 9617480 + 6e4eb34 commit 1087616
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 29 deletions.
26 changes: 13 additions & 13 deletions charts/cluster-component/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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.0
version: 0.2.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -24,18 +24,18 @@ version: 0.2.0
appVersion: "0.2.0"

dependencies:
- name: cert-manager
version: 0.1.0
condition: cert-manager.enabled
- name: metallb
version: 0.1.0
condition: metallb.enabled
- name: ingress-nginx
version: 4.2.5
condition: ingress-nginx.enabled
- name: openebs
version: 3.3.1
condition: openebs.enabled
- name: cert-manager
version: 0.1.0
condition: cert-manager.enabled
- name: metallb
version: 0.1.0
condition: metallb.enabled
- name: ingress-nginx
version: 4.2.5
condition: ingress-nginx.enabled
- name: openebs
version: 3.3.1
condition: openebs.enabled

maintainers:
- name: nkwangleiGIT
Expand Down
22 changes: 6 additions & 16 deletions charts/cluster-component/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,14 @@
ingress-nginx:
enabled: true
# MUST update this value
deployedHost: &deployedHost
<replaced-ingress-node-name>
deployedHost: &deployedHost <replaced-ingress-node-name>
controller:
ingressClassResource:
name: portal-ingress
ingressClass: portal-ingress
image:
repository: hub.tenxcloud.com/u4a-component/ingress-nginx-controller
repository: kubebb/ingress-nginx-controller
tag: "v1.3.0"
admissionWebhooks:
enabled: false
patch:
enabled: true
image:
registry: hub.tenxcloud.com
image: u4a-component/kube-webhook-certgen
tag: "0.30.0"
digest: ""
updateStrategy:
type: Recreate
extraArgs:
Expand Down Expand Up @@ -59,9 +49,9 @@ ingress-nginx:
cert-manager:
enabled: true
# Required: Cert manager for certificate management
image: hub.tenxcloud.com/u4a-component/cert-manager-controller:v1.8.0
caInjectorImage: hub.tenxcloud.com/u4a-component/cert-manager-cainjector:v1.8.0
webhookImage: hub.tenxcloud.com/u4a-component/cert-manager-webhook:v1.8.0
image: kubebb/cert-manager-controller:v1.8.0
caInjectorImage: kubebb/cert-manager-cainjector:v1.8.0
webhookImage: kubebb/cert-manager-webhook:v1.8.0

openebs:
enabled: false
Expand All @@ -83,7 +73,7 @@ metallb:
enabled: false
# Must configure the available addresses if metallb is enabled
ipAddresses:
- 192.168.1.10-192.168.90.15
- 192.168.1.10-192.168.90.15
controller:
image:
repository: hub.tenxcloud.com/u4a-component/controller
Expand Down

0 comments on commit 1087616

Please sign in to comment.