diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 75793149561d2daf0bc23f46f3482fbdb550e145..dd68cd8ef1c12192e17291732eb0b297174cd0a3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,7 +6,7 @@ name: Release on: [push] env: - version: v0.2.1 + version: v1.0.1 jobs: docker: @@ -14,7 +14,7 @@ jobs: strategy: matrix: platform: [ linux/amd64 ] - target: [ di-operator, di-server, di-webhook ] + target: [ di-orchestrator ] steps: - name: Checkout uses: actions/checkout@v2 @@ -26,12 +26,12 @@ jobs: TARGET: ${{ matrix.target }} run: | DOCKER_IMAGE=$DOCKERIO_ORG/$TARGET - VERSION=${version}-edge + VERSION=${version}-nightly if [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} fi if [ "${{ github.event_name }}" = "schedule" ]; then - VERSION=nightly + VERSION=edge fi TAGS="${DOCKER_IMAGE}:${VERSION}" if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then diff --git a/config/di-manager.yaml b/config/di-manager.yaml index 921858dcec09cfa1080ea644af61df3cc82a2070..034327f5ea7a0757a78a827a9e61ddf36f8f3e2d 100644 --- a/config/di-manager.yaml +++ b/config/di-manager.yaml @@ -4231,8 +4231,8 @@ subjects: apiVersion: v1 data: DI_JOB_DEFAULT_RESOURCES: '{"resources": {"requests": {"cpu": 1, "memory": "2Gi"}}}' - DI_ORCHESTRATOR_VERSION: v1.0.0 - DI_SERVER_URL: http://di-server.di-system:8080 + DI_ORCHESTRATOR_VERSION: v1.0.1 + DI_SERVER_URL: http://di-server.di-system:8081 kind: ConfigMap metadata: name: di-config diff --git a/config/manager/di_config.yaml b/config/manager/di_config.yaml index 2380d46113dfbe8df223eac0a7bd2f1ae25c01a0..b138f75c787fc58b8c890270f72cd4922c22a3e5 100644 --- a/config/manager/di_config.yaml +++ b/config/manager/di_config.yaml @@ -4,5 +4,5 @@ metadata: name: di-config data: DI_SERVER_URL: "http://di-server.di-system:8081" - DI_ORCHESTRATOR_VERSION: v1.0.0 + DI_ORCHESTRATOR_VERSION: v1.0.1 DI_JOB_DEFAULT_RESOURCES: '{"resources": {"requests": {"cpu": 1, "memory": "2Gi"}}}' diff --git a/hack/update-version.sh b/hack/update-version.sh index 3cd44b299e95709108f9bc035a4a75830edfacb3..82c8e28b0bc8171bbfb13001d8efe63d97a5db02 100755 --- a/hack/update-version.sh +++ b/hack/update-version.sh @@ -20,6 +20,17 @@ fi for f in ".gitlab-ci.yml"; do echo "update ci version to ${version}" sed -r "s|^(\s*)VERSION:(\s*)(.*)|\1VERSION: ${version}|" "$f" >.tmp - # sed -r "s|^(\s*)VERSION:(\s*)v[0-9+][\.0-9+]*|\1VERSION: ${version}|" "$f" > .tmp + mv .tmp "$f" +done + +for f in "config/manager/di_config.yaml"; do + echo "update config map orchestrator version to ${version}" + sed -r "s|^(\s*)DI_ORCHESTRATOR_VERSION:(\s*)(.*)|\1DI_ORCHESTRATOR_VERSION: ${version}|" "$f" >.tmp + mv .tmp "$f" +done + +for f in ".github/workflows/release.yaml"; do + echo "update github action version to ${version}" + sed -r "s|^(\s*)version:(\s*)(.*)|\1version: ${version}|" "$f" >.tmp mv .tmp "$f" done