chore: get rid of unused values & ops related to ks redis (#1695)

This commit is contained in:
dkeven 2025-08-12 00:29:28 +08:00 committed by GitHub
parent 8dea896a28
commit ad183f05ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 2 additions and 56 deletions

View file

@ -44,5 +44,3 @@ os:
dashboard:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -34,5 +34,3 @@ os:
appstore:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -1,5 +1,3 @@
kubesphere:
redis_password: ""
backup:
bucket: "${BACKUP_CLUSTER_BUCKET}"
key_prefix: "${BACKUP_KEY_PREFIX}"

View file

@ -59,14 +59,7 @@ securityContext: {}
# Kubernetes Version shows in KubeSphere console
# kube_version: "v1.19.4" # ! 这里要替换下
env:
- name: KUBESPHERE_REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: redis-secret
key: auth
tolerations:
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: CriticalAddonsOnly

View file

@ -58,14 +58,7 @@ securityContext: {}
# Kubernetes Version shows in KubeSphere console
# kube_version: "v1.19.4" # ! 这里要替换下
env:
- name: KUBESPHERE_REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: redis-secret
key: auth
tolerations:
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: CriticalAddonsOnly

View file

@ -27,27 +27,12 @@ type InstallOsSystem struct {
}
func (t *InstallOsSystem) Execute(runtime connector.Runtime) error {
kubectl, err := util.GetCommand(common.CommandKubectl)
if err != nil {
return errors.Wrap(errors.WithStack(err), "kubectl not found")
}
if !runtime.GetSystemInfo().IsDarwin() {
if _, err := runtime.GetRunner().SudoCmd(fmt.Sprintf("mkdir -p %s && chown 1000:1000 %s", storage.OlaresSharedLibDir, storage.OlaresSharedLibDir), false, false); err != nil {
return errors.Wrap(errors.WithStack(err), "failed to create shared lib dir")
}
}
var cmd = fmt.Sprintf("%s get secret -n kubesphere-system redis-secret -o jsonpath='{.data.auth}' |base64 -d", kubectl)
redisPwd, err := runtime.GetRunner().SudoCmd(cmd, false, false)
if err != nil {
return errors.Wrap(errors.WithStack(err), "get redis secret error")
}
if redisPwd == "" {
return fmt.Errorf("redis secret not found")
}
config, err := ctrl.GetConfig()
if err != nil {
return err
@ -61,7 +46,6 @@ func (t *InstallOsSystem) Execute(runtime connector.Runtime) error {
defer cancel()
vals := map[string]interface{}{
"kubesphere": map[string]interface{}{"redis_password": redisPwd},
"backup": map[string]interface{}{
"bucket": t.KubeConf.Arg.Storage.BackupClusterBucket,
"key_prefix": t.KubeConf.Arg.Storage.StoragePrefix,

View file

@ -38,5 +38,3 @@ os:
search2:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -38,5 +38,3 @@ os:
search2:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -38,5 +38,3 @@ os:
search2:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -38,5 +38,3 @@ os:
search2:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -38,5 +38,3 @@ os:
search2:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -38,5 +38,3 @@ os:
search2:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -38,5 +38,3 @@ os:
search2:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -38,5 +38,3 @@ os:
search2:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""

View file

@ -38,5 +38,3 @@ os:
search2:
appKey: '${ks[0]}'
appSecret: test
kubesphere:
redis_password: ""