diff --git a/.github/workflows/move_crd_values_to_operator.yaml b/.github/workflows/move_crd_values_to_operator.yaml index 3f51116d..83ce98ec 100644 --- a/.github/workflows/move_crd_values_to_operator.yaml +++ b/.github/workflows/move_crd_values_to_operator.yaml @@ -20,8 +20,8 @@ jobs: - name: Get Source Branch Name id: get_source_branch run: | - MERGE_COMMIT=$(git --no-pager log -1 --pretty=%H) - SOURCE_BRANCH=$(git show -s --pretty=%B $MERGE_COMMIT | grep -oP '(?<=from )\S+' | sed 's/^[^/]*\///') + MERGE_COMMIT=$(git --no-pager log -1 --pretty=format:%H) + SOURCE_BRANCH=$(git --no-pager show -s --pretty=%B $MERGE_COMMIT | grep -o 'from [^ ]*' | awk '{print $2}' | sed 's/^[^/]*\///') echo "SOURCE_BRANCH=${SOURCE_BRANCH}" >> $GITHUB_ENV if [[ "$SOURCE_BRANCH" == *operator-release* ]]; then diff --git a/components/tyk-operator/templates/all.yaml b/components/tyk-operator/templates/all.yaml index 0560e3d9..f5f6209f 100644 --- a/components/tyk-operator/templates/all.yaml +++ b/components/tyk-operator/templates/all.yaml @@ -731,7 +731,7 @@ metadata: tier: frontend spec: containers: - - name: my-container2 + - name: my-container3 image: my-image:latest ports: - containerPort: 80