fix: 修正CI workflow secret名称,与jimeng-clone保持一致
- prod环境硬编码CR server/username/org - dev环境CR_ORG硬编码为dev - kubeconfig使用VOLCANO_TEST/PROD_KUBE_CONFIG Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
afbc8594ee
commit
8b6dc47a41
@ -21,17 +21,17 @@ jobs:
|
|||||||
|
|
||||||
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
||||||
echo "IMAGE_TAG=prod-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
echo "IMAGE_TAG=prod-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
||||||
echo "CR_SERVER_ACTIVE=${{ secrets.CR_PROD_SERVER }}" >> $GITHUB_ENV
|
echo "CR_SERVER_ACTIVE=gitea-prod-cn-shanghai.cr.volces.com" >> $GITHUB_ENV
|
||||||
echo "CR_USERNAME_ACTIVE=${{ secrets.CR_PROD_USERNAME }}" >> $GITHUB_ENV
|
echo "CR_USERNAME_ACTIVE=seaislee@76339115" >> $GITHUB_ENV
|
||||||
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PROD_PASSWORD }}" >> $GITHUB_ENV
|
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PROD_PASSWORD }}" >> $GITHUB_ENV
|
||||||
echo "CR_ORG=${{ secrets.CR_PROD_ORG }}" >> $GITHUB_ENV
|
echo "CR_ORG=prod" >> $GITHUB_ENV
|
||||||
echo "DEPLOY_ENV=production" >> $GITHUB_ENV
|
echo "DEPLOY_ENV=production" >> $GITHUB_ENV
|
||||||
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
||||||
echo "IMAGE_TAG=dev-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
echo "IMAGE_TAG=dev-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
||||||
echo "CR_SERVER_ACTIVE=${{ secrets.CR_SERVER }}" >> $GITHUB_ENV
|
echo "CR_SERVER_ACTIVE=${{ secrets.CR_SERVER }}" >> $GITHUB_ENV
|
||||||
echo "CR_USERNAME_ACTIVE=${{ secrets.CR_USERNAME }}" >> $GITHUB_ENV
|
echo "CR_USERNAME_ACTIVE=${{ secrets.CR_USERNAME }}" >> $GITHUB_ENV
|
||||||
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PASSWORD }}" >> $GITHUB_ENV
|
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PASSWORD }}" >> $GITHUB_ENV
|
||||||
echo "CR_ORG=${{ secrets.CR_ORG }}" >> $GITHUB_ENV
|
echo "CR_ORG=dev" >> $GITHUB_ENV
|
||||||
echo "DEPLOY_ENV=development" >> $GITHUB_ENV
|
echo "DEPLOY_ENV=development" >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -72,9 +72,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir -p $HOME/.kube
|
mkdir -p $HOME/.kube
|
||||||
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
||||||
printf '%s\n' '${{ secrets.KUBE_CONFIG_PROD }}' > $HOME/.kube/config
|
printf '%s\n' '${{ secrets.VOLCANO_PROD_KUBE_CONFIG }}' > $HOME/.kube/config
|
||||||
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
||||||
printf '%s\n' '${{ secrets.KUBE_CONFIG }}' > $HOME/.kube/config
|
printf '%s\n' '${{ secrets.VOLCANO_TEST_KUBE_CONFIG }}' > $HOME/.kube/config
|
||||||
fi
|
fi
|
||||||
chmod 600 $HOME/.kube/config
|
chmod 600 $HOME/.kube/config
|
||||||
echo "kubeconfig lines: $(wc -l < $HOME/.kube/config)"
|
echo "kubeconfig lines: $(wc -l < $HOME/.kube/config)"
|
||||||
|
|||||||
@ -21,17 +21,17 @@ jobs:
|
|||||||
|
|
||||||
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
||||||
echo "IMAGE_TAG=prod-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
echo "IMAGE_TAG=prod-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
||||||
echo "CR_SERVER_ACTIVE=${{ secrets.CR_PROD_SERVER }}" >> $GITHUB_ENV
|
echo "CR_SERVER_ACTIVE=gitea-prod-cn-shanghai.cr.volces.com" >> $GITHUB_ENV
|
||||||
echo "CR_USERNAME_ACTIVE=${{ secrets.CR_PROD_USERNAME }}" >> $GITHUB_ENV
|
echo "CR_USERNAME_ACTIVE=seaislee@76339115" >> $GITHUB_ENV
|
||||||
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PROD_PASSWORD }}" >> $GITHUB_ENV
|
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PROD_PASSWORD }}" >> $GITHUB_ENV
|
||||||
echo "CR_ORG=${{ secrets.CR_PROD_ORG }}" >> $GITHUB_ENV
|
echo "CR_ORG=prod" >> $GITHUB_ENV
|
||||||
echo "DEPLOY_ENV=production" >> $GITHUB_ENV
|
echo "DEPLOY_ENV=production" >> $GITHUB_ENV
|
||||||
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
||||||
echo "IMAGE_TAG=dev-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
echo "IMAGE_TAG=dev-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
|
||||||
echo "CR_SERVER_ACTIVE=${{ secrets.CR_SERVER }}" >> $GITHUB_ENV
|
echo "CR_SERVER_ACTIVE=${{ secrets.CR_SERVER }}" >> $GITHUB_ENV
|
||||||
echo "CR_USERNAME_ACTIVE=${{ secrets.CR_USERNAME }}" >> $GITHUB_ENV
|
echo "CR_USERNAME_ACTIVE=${{ secrets.CR_USERNAME }}" >> $GITHUB_ENV
|
||||||
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PASSWORD }}" >> $GITHUB_ENV
|
echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PASSWORD }}" >> $GITHUB_ENV
|
||||||
echo "CR_ORG=${{ secrets.CR_ORG }}" >> $GITHUB_ENV
|
echo "CR_ORG=dev" >> $GITHUB_ENV
|
||||||
echo "DEPLOY_ENV=development" >> $GITHUB_ENV
|
echo "DEPLOY_ENV=development" >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -72,9 +72,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir -p $HOME/.kube
|
mkdir -p $HOME/.kube
|
||||||
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
if [[ "${{ github.ref_name }}" == "master" ]]; then
|
||||||
printf '%s\n' '${{ secrets.KUBE_CONFIG_PROD }}' > $HOME/.kube/config
|
printf '%s\n' '${{ secrets.VOLCANO_PROD_KUBE_CONFIG }}' > $HOME/.kube/config
|
||||||
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
|
||||||
printf '%s\n' '${{ secrets.KUBE_CONFIG }}' > $HOME/.kube/config
|
printf '%s\n' '${{ secrets.VOLCANO_TEST_KUBE_CONFIG }}' > $HOME/.kube/config
|
||||||
fi
|
fi
|
||||||
chmod 600 $HOME/.kube/config
|
chmod 600 $HOME/.kube/config
|
||||||
echo "kubeconfig lines: $(wc -l < $HOME/.kube/config)"
|
echo "kubeconfig lines: $(wc -l < $HOME/.kube/config)"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user