mirror of
https://github.com/labring/sealos.git
synced 2026-09-24 15:46:19 +08:00
fix(build): update values.yaml references for new Docker image in bui… (#6715)
fix(build): update values.yaml references for new Docker image in build scripts (#6713) * fix(build): update values.yaml references for new Docker image in build scripts * fix(job-init): retrieve password salt from ConfigMap and improve password display output * fix(job-init): retrieve password salt from ConfigMap and improve password display output --------- Signed-off-by: cuisongliu <cuisongliu@qq.com> Co-authored-by: cuisongliu <cuisongliu@qq.com>
This commit is contained in:
github-actions[bot]
co-authored by
cuisongliu
cuisongliu
parent
a4282744d3
commit
4772e7d32a
@@ -250,6 +250,12 @@ jobs:
|
||||
if [[ -f charts/${MODULE_PATH}/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_PATH}/values.yaml
|
||||
fi
|
||||
if [[ -f charts/${MODULE_NAME}/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_NAME}/values.yaml
|
||||
fi
|
||||
if [[ -f charts/${MODULE_NAME}-controller/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_NAME}-controller/values.yaml
|
||||
fi
|
||||
sudo rm -rf registry
|
||||
echo "Building ${TAG}-amd64"
|
||||
sudo sealos build -t "${TAG}-amd64" --platform linux/amd64 -f Kubefile
|
||||
@@ -265,6 +271,12 @@ jobs:
|
||||
if [[ -f charts/${MODULE_PATH}/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_PATH}/values.yaml
|
||||
fi
|
||||
if [[ -f charts/${MODULE_NAME}/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_NAME}/values.yaml
|
||||
fi
|
||||
if [[ -f charts/${MODULE_NAME}-controller/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_NAME}-controller/values.yaml
|
||||
fi
|
||||
sudo rm -rf registry
|
||||
echo "Building ${TAG}-arm64"
|
||||
sudo sealos build -t "${TAG}-arm64" --platform linux/arm64 -f Kubefile
|
||||
|
||||
@@ -284,6 +284,9 @@ jobs:
|
||||
if [[ -f charts/${MODULE_NAME}/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_NAME}/values.yaml
|
||||
fi
|
||||
if [[ -f charts/${MODULE_NAME}-frontend/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_NAME}-frontend/values.yaml
|
||||
fi
|
||||
sudo rm -rf registry
|
||||
echo "Building ${TAG}-amd64"
|
||||
sudo sealos build -t "${TAG}-amd64" --platform linux/amd64 -f Kubefile
|
||||
@@ -299,6 +302,9 @@ jobs:
|
||||
if [[ -f charts/${MODULE_NAME}/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_NAME}/values.yaml
|
||||
fi
|
||||
if [[ -f charts/${MODULE_NAME}-frontend/values.yaml ]]; then
|
||||
sed -i -E "s;(${OLD_DOCKER_REPO}|${GHCR_DOCKER_REPO}):[^[:space:]\"']*;${NEW_DOCKER_IMAGE};" charts/${MODULE_NAME}-frontend/values.yaml
|
||||
fi
|
||||
sudo rm -rf registry
|
||||
echo "Building ${TAG}-arm64"
|
||||
sudo sealos build -t "${TAG}-arm64" --platform linux/arm64 -f Kubefile
|
||||
|
||||
@@ -34,6 +34,14 @@ spec:
|
||||
image: "{{ .Values.image }}"
|
||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||
env:
|
||||
- name: LOCAL_REGION
|
||||
value: {{.Values.env.localRegion}}
|
||||
- name: DOMAIN
|
||||
value: {{.Values.env.domain}}
|
||||
- name: GLOBAL_COCKROACH_URI
|
||||
value: {{.Values.env.globalCockroachUri}}
|
||||
- name: LOCAL_COCKROACH_URI
|
||||
value: {{.Values.env.localCockroachUri}}
|
||||
- name: PASSWORD_SALT
|
||||
value: {{ .Values.env.passwordSalt | quote }}
|
||||
- name: ADMIN_PASSWORD
|
||||
@@ -42,11 +50,6 @@ spec:
|
||||
value: {{ .Values.env.adminUserName | quote }}
|
||||
- name: WORKSPACE_PREFIX
|
||||
value: {{ .Values.env.workspacePrefix | quote }}
|
||||
{{- if .Values.env.envFromConfigMap }}
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: {{ .Values.env.envFromConfigMap | quote }}
|
||||
{{- end }}
|
||||
resources:
|
||||
{{- toYaml .Values.resources | nindent 12 }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
|
||||
@@ -32,7 +32,10 @@ env:
|
||||
adminPassword: "sealos2023"
|
||||
adminUserName: "admin"
|
||||
workspacePrefix: "ns-"
|
||||
envFromConfigMap: "account-manager-env"
|
||||
domain: ""
|
||||
globalCockroachUri: ""
|
||||
localCockroachUri: ""
|
||||
localRegion: ""
|
||||
|
||||
resources:
|
||||
limits:
|
||||
|
||||
@@ -58,6 +58,7 @@ get_or_generate_admin_password() {
|
||||
|
||||
HELM_SET_ARGS=()
|
||||
|
||||
PASSWORD_SALT=$(kubectl get cm -n sealos-system sealos-config -o "jsonpath={.data.passwordSalt}" 2>/dev/null || true)
|
||||
# 处理密码盐值
|
||||
if [ -n "${PASSWORD_SALT:-}" ]; then
|
||||
add_set_string env.passwordSalt "${PASSWORD_SALT}"
|
||||
@@ -68,13 +69,11 @@ ADMIN_PASSWORD=$(get_or_generate_admin_password)
|
||||
add_set_string env.adminPassword "${ADMIN_PASSWORD}"
|
||||
|
||||
# 打印密码信息（如果是从 ConfigMap 读取或自动生成的）
|
||||
if [ -z "${ADMIN_PASSWORD:-}" ]; then
|
||||
echo "=========================================="
|
||||
echo "Admin Password: ${ADMIN_PASSWORD}"
|
||||
echo "Password saved to ConfigMap: ${ADMIN_PASSWORD_CM_NAME} in namespace ${ADMIN_PASSWORD_CM_NAMESPACE}"
|
||||
echo "Retrieve with: kubectl get cm ${ADMIN_PASSWORD_CM_NAME} -n ${ADMIN_PASSWORD_CM_NAMESPACE} -o jsonpath='{.data.${ADMIN_PASSWORD_CM_KEY}}'"
|
||||
echo "=========================================="
|
||||
fi
|
||||
echo "=========================================="
|
||||
echo "Admin Password: ${ADMIN_PASSWORD}"
|
||||
echo "Password saved to ConfigMap: ${ADMIN_PASSWORD_CM_NAME} in namespace ${ADMIN_PASSWORD_CM_NAMESPACE}"
|
||||
echo "Retrieve with: kubectl get cm ${ADMIN_PASSWORD_CM_NAME} -n ${ADMIN_PASSWORD_CM_NAMESPACE} -o jsonpath='{.data.${ADMIN_PASSWORD_CM_KEY}}'"
|
||||
echo "=========================================="
|
||||
|
||||
if [ -n "${ADMIN_USER_NAME:-}" ]; then
|
||||
add_set_string env.adminUserName "${ADMIN_USER_NAME}"
|
||||
@@ -90,6 +89,16 @@ if [ -n "${JOB_INIT_SERVICE_ACCOUNT:-}" ]; then
|
||||
add_set_string serviceAccount.name "${JOB_INIT_SERVICE_ACCOUNT}"
|
||||
fi
|
||||
|
||||
SEALOS_CLOUD_DOMAIN=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.cloudDomain}')
|
||||
varDatabaseGlobalCockroachdbURI=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.databaseGlobalCockroachdbURI}')
|
||||
varDatabaseLocalCockroachdbURI=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.databaseLocalCockroachdbURI}')
|
||||
varRegionUID=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.regionUID}')
|
||||
|
||||
add_set_string env.domain "${SEALOS_CLOUD_DOMAIN}"
|
||||
add_set_string env.globalCockroachUri "${varDatabaseGlobalCockroachdbURI}"
|
||||
add_set_string env.localCockroachUri "${varDatabaseLocalCockroachdbURI}"
|
||||
add_set_string env.localRegion "${varRegionUID}"
|
||||
|
||||
if kubectl -n "${RELEASE_NAMESPACE}" get job "${JOB_NAME}" >/dev/null 2>&1; then
|
||||
kubectl -n "${RELEASE_NAMESPACE}" delete job "${JOB_NAME}" --ignore-not-found --wait=true
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user