Revert using yq to replace YAML values

capactio · Jan 26, 2022 · 505bf6f · 505bf6f
1 parent 0debf8e
commit 505bf6f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/branch-build.yaml b/.github/workflows/branch-build.yaml
@@ -140,8 +140,6 @@ jobs:
  uses: actions/checkout@v2
  with:
  fetch-depth: 2 # To be able to compare with the previous commit and detect changed files
- - name: Install yq
- run: sudo snap install yq --channel=v4/stable
  - uses: google-github-actions/setup-gcloud@master
  with:
  service_account_key: ${{ secrets.CAPACT_GCS_CREDS }}

diff --git a/.github/workflows/make-release.yaml b/.github/workflows/make-release.yaml
@@ -46,8 +46,6 @@ jobs:
  go-version: ${{env.GO_VERSION}}
  - name: Set up GoReleaser
  run: go install github.com/goreleaser/goreleaser@v1.1.0
- - name: Install yq
- run: sudo snap install yq --channel=v4/stable
  - name: Set up GCS
  uses: google-github-actions/setup-gcloud@master
  with:

diff --git a/hack/make-release.sh b/hack/make-release.sh
@@ -1,19 +1,21 @@
 #!/bin/bash
 
+# TODO: Refactor this script to not use error-prone sed usage
+# See discussion https://github.com/capactio/capact/pull/617
+
 set -e
 
 CURRENT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 REPO_ROOT_DIR=$(cd "${CURRENT_DIR}/.." && pwd)
 readonly CURRENT_DIR
 readonly REPO_ROOT_DIR
 
-
 release::update_helm_charts_version() {
  local -r release_version="$1"
  local -r deploy_dir="${REPO_ROOT_DIR}/deploy/kubernetes/charts"
 
  for d in "${deploy_dir}"/*/ ; do
- yq eval -i ".version = \"${release_version}\"" "${d}/Chart.yaml"
+ sed -i.bak "s/^version: .*/version: ${release_version}/g" "${d}/Chart.yaml"
  done
 }
 
@@ -28,17 +30,17 @@ release::make_prepare_release_commit() {
 
 release::set_capact_images_in_charts() {
  local -r image_tag="$1"
- yq eval -i ".global.containerRegistry.overrideTag = \"${image_tag}\"" "${REPO_ROOT_DIR}/deploy/kubernetes/charts/capact/values.yaml"
+ sed -E -i.bak "s/overrideTag: \".+\"/overrideTag: \"${image_tag}\"/g" "${REPO_ROOT_DIR}/deploy/kubernetes/charts/capact/values.yaml"
 }
 
 release::set_dashboard_image_in_chart() {
  local -r image_tag="$1"
- yq eval -i ".dashboard.image.tag = \"${image_tag}\"" "${REPO_ROOT_DIR}/deploy/kubernetes/charts/capact/values.yaml"
+ sed -E -i.bak "s/tag: \".+\"/tag: \"${image_tag}\"/g" "${REPO_ROOT_DIR}/deploy/kubernetes/charts/capact/values.yaml"
 }
 
 release::set_hub_manifest_source_branch() {
  local -r branch="$1"
- yq eval -i ".populator.manifestsLocations[0].branch = \"${branch}\"" "${REPO_ROOT_DIR}/deploy/kubernetes/charts/capact/charts/hub-public/values.yaml"
+ sed -E -i.bak "s/branch: .+/branch: ${branch}/g" "${REPO_ROOT_DIR}/deploy/kubernetes/charts/capact/charts/hub-public/values.yaml"
 }
 
 release::make_release_commit() {

diff --git a/hack/release-charts.sh b/hack/release-charts.sh
@@ -35,10 +35,10 @@ setChartVersionAndImageTagToCommitSHA() {
  readonly version="${GITHUB_SHA:0:7}"
 
  for chart in "${charts[@]}"; do
- yq eval -i ".version = .version + \"-${version}\"" "${DEPLOY_CHARTS_DIR}/${chart}/Chart.yaml"
+ sed -i.bak "/^version: / s/$/-${version}/" "${DEPLOY_CHARTS_DIR}/${chart}/Chart.yaml"
  done
 
- yq eval -i ".global.containerRegistry.overrideTag = \"${version}\"" "${DEPLOY_CHARTS_DIR}/capact/values.yaml"
+ sed -i.bak "s/overrideTag: \"latest\"/overrideTag: \"${version}\"/g" "${DEPLOY_CHARTS_DIR}/capact/values.yaml"
 }
 
 main() {