Skip to content

Remove -chart suffix from OBS chart build process #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anmazzotti wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove -chart suffix from OBS chart build process #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b81a02
Remove -chart suffix from OBS chart build process
anmazzotti Aug 22, 2024
a75af70
Fix tests
anmazzotti Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/chart/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ runs:
- name: Pull chart from OBS
env:
B_REPO: ${{ steps.set_repo.outputs.build_repo }}
OPERATOR_CHART: rancher/elemental-operator-chart
CRDS_CHART: rancher/elemental-operator-crds-chart
OPERATOR_CHART: rancher/elemental-operator
CRDS_CHART: rancher/elemental-operator-crds
shell: bash
run: |
mkdir -p build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ jobs:
- name: Pull chart for PR
env:
PR_NUMBER: ${{ github.event.number }}
OPERATOR_CHART: rancher/elemental-operator-chart
CRDS_CHART: rancher/elemental-operator-crds-chart
OPERATOR_CHART: rancher/elemental-operator
CRDS_CHART: rancher/elemental-operator-crds
run: |
set -x
B_REPO=registry.opensuse.org/isv/rancher/elemental/pr/rancher/elemental-operator/pr-${PR_NUMBER}/charts
Expand All @@ -77,7 +77,7 @@ jobs:
id: chart
run: |
set -x
FILE=$(find . -type f -name "elemental-operator-chart-[1-9]*.tgz" -print)
FILE=$(find . -type f -name "elemental-operator-[1-9]*.tgz" -print)
CHART=$(basename $FILE)
echo "chart_name=$CHART" >> $GITHUB_OUTPUT
- name: Upload chart
Expand Down
6 changes: 3 additions & 3 deletions .obs/chartfile/crds/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
#!BuildTag: rancher/elemental-operator-crds-chart:latest
#!BuildTag: rancher/elemental-operator-crds-chart:%VERSION%
#!BuildTag: rancher/elemental-operator-crds-chart:%VERSION%-%RELEASE%
#!BuildTag: rancher/elemental-operator-crds:latest
#!BuildTag: rancher/elemental-operator-crds:%VERSION%
#!BuildTag: rancher/elemental-operator-crds:%VERSION%-%RELEASE%
apiVersion: v2
name: elemental-operator-crds
description: A Helm chart for deploying Rancher Elemental Operator CRDs
Expand Down
6 changes: 3 additions & 3 deletions .obs/chartfile/operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
#!BuildTag: rancher/elemental-operator-chart:latest
#!BuildTag: rancher/elemental-operator-chart:%VERSION%
#!BuildTag: rancher/elemental-operator-chart:%VERSION%-%RELEASE%
#!BuildTag: rancher/elemental-operator:latest
#!BuildTag: rancher/elemental-operator:%VERSION%
#!BuildTag: rancher/elemental-operator:%VERSION%-%RELEASE%
apiVersion: v2
name: elemental-operator
description: Elemental provides Cloud Native OS Management for Cluster Nodes.
Expand Down
4 changes: 2 additions & 2 deletions .obs/helper_scripts/listimages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ if [ ${REGISTRY} != "registry.suse.com" ]; then
REGISTRY="$(dirname ${REGISTRY})/charts"
fi

echo "${REGISTRY}/rancher/elemental-operator-crds-chart:${OPERATOR}"
echo "${REGISTRY}/rancher/elemental-operator-chart:${OPERATOR}"
echo "${REGISTRY}/rancher/elemental-operator-crds:${OPERATOR}"
echo "${REGISTRY}/rancher/elemental-operator:${OPERATOR}"