Skip to content

Commit d975b38

Browse files
committed
upgrade img and version as it is in other otters repos
1 parent d155fec commit d975b38

File tree

5 files changed

+29
-27
lines changed

5 files changed

+29
-27
lines changed

.github/scripts/release.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ set -E # needs to be set if we want the ERR trap
77
set -o pipefail # prevents errors in a pipeline from being masked
88

99
# Expected variables:
10-
PULL_BASE_REF=${PULL_BASE_REF?"Define PULL_BASE_REF env"} # name of the tag
1110
GITHUB_TOKEN=${GITHUB_TOKEN?"Define GITHUB_TOKEN env"} # github token used to upload the template yaml
1211
RELEASE_ID=${RELEASE_ID?"Define RELEASE_ID env"} # github token used to upload the template yaml
1312

@@ -31,9 +30,7 @@ uploadFile() {
3130
fi
3231
}
3332

34-
echo "PULL_BASE_REF ${PULL_BASE_REF}"
35-
36-
MODULE_VERSION=${PULL_BASE_REF} make render-manifest
33+
make render-manifest
3734

3835
echo "Generated keda-manager.yaml:"
3936
cat keda-manager.yaml
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
3+
# standard bash error handling
4+
set -o errexit # exit immediately when a command fails.
5+
set -E # needs to be set if we want the ERR trap
6+
set -o pipefail # prevents errors in a pipeline from being masked
7+
8+
# Expected variables:
9+
IMG=${IMG?"Define IMG env"} # operator img
10+
MODULE_VERSION=${MODULE_VERSION?"Define MODULE_VERSION env"} # module version used to set common labels
11+
12+
PROJECT_ROOT=${PWD}
13+
CONFIG_OPERATOR=${PROJECT_ROOT}/config
14+
15+
echo "ensure kustomize..."
16+
PROJECT_ROOT=${PROJECT_ROOT} make -C ${PROJECT_ROOT} kustomize
17+
18+
echo "upgrade ${CONFIG_OPERATOR}..."
19+
20+
echo "upgrade image to ${IMG}..."
21+
cd ${CONFIG_OPERATOR}/manager && ${PROJECT_ROOT}/bin/kustomize edit set image controller=${IMG}
22+
23+
echo "upgrade module version to ${MODULE_VERSION}..."
24+
cd ${CONFIG_OPERATOR}/default && ${PROJECT_ROOT}/bin/kustomize edit add label app.kubernetes.io/version:${MODULE_VERSION} --force --without-selector --include-templates

.github/workflows/create-release.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
token: ${{ secrets.BOT_TOKEN }}
2929
fetch-depth: 0
3030

31-
- name: Bump crd
31+
- name: Bump kustomize
3232
run: |
33-
./hack/replace_keda_crd_version.sh
33+
./.github/scripts/upgrade-operator-kustomize.sh
3434
env:
35-
IMG_VERSION: ${{ github.event.inputs.name }}
36-
PROJECT_ROOT: "."
35+
IMG: europe-docker.pkg.dev/kyma-project/prod/keda-manager:${{ github.event.inputs.name }}
36+
MODULE_VERSION: ${{ github.event.inputs.name }}
3737

3838
- name: Bump sec-scanners-config.yaml
3939
run: ./.github/scripts/upgrade-sec-scanners-config.sh
@@ -101,7 +101,6 @@ jobs:
101101
id: create-assets
102102
env:
103103
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
104-
PULL_BASE_REF: ${{ github.event.inputs.name }}
105104
RELEASE_ID: ${{ steps.create-draft.outputs.release_id }}
106105
run: ./.github/scripts/release.sh
107106

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
9494

9595
.PHONY: render-manifest
9696
render-manifest: manifests kustomize ## Render keda-manager.yaml manifest.
97-
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
9897
$(KUSTOMIZE) build config/default > keda-manager.yaml
9998

10099
.PHONY: undeploy

hack/replace_keda_crd_version.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)