Skip to content

Commit 32903c0

Browse files
laveryalaverya
committed
Merge remote-tracking branch 'origin/main' into k0s-1-28-7
2 parents 44fc7e3 + f983fc5 commit 32903c0

File tree

8 files changed

+22
-20
lines changed

8 files changed

+22
-20
lines changed

‎.github/workflows/pull-request.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ jobs:
7777
sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
7878
7979
# re-promote a release containing an old version of embedded-cluster to test upgrades
80-
replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "${SHORT_SHA}-pre-minio-removal"
80+
replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "appver-${SHORT_SHA}-pre-minio-removal"
8181
82-
replicated release create --yaml-dir e2e/kots-release-install --promote CI --version "${SHORT_SHA}"
83-
replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "${SHORT_SHA}-upgrade"
82+
replicated release create --yaml-dir e2e/kots-release-install --promote CI --version "appver-${SHORT_SHA}"
83+
replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "appver-${SHORT_SHA}-upgrade"
8484
- name: Build CI binary
8585
run: |
8686
export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
8787
echo "# channel release object" > e2e/kots-release-install/release.yaml
8888
echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
8989
echo 'appSlug: "embedded-cluster-smoke-test-staging-app"' >> e2e/kots-release-install/release.yaml
90-
echo "versionLabel: \"${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
90+
echo "versionLabel: \"appver-${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
9191
cat e2e/kots-release-install/release.yaml
9292
cp output/bin/embedded-cluster output/bin/embedded-cluster-original
9393
make embedded-release VERSION="${SHORT_SHA}" # this is done after the metadata.json is generated so as to not include additional charts
@@ -115,7 +115,7 @@ jobs:
115115
sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
116116
117117
rm e2e/kots-release-install/release.yaml
118-
replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "${SHORT_SHA}"
118+
replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "appver-${SHORT_SHA}"
119119
120120
- name: upload binary
121121
uses: actions/upload-artifact@v4

‎.github/workflows/release-dev.yaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ jobs:
1919
go-version: "1.21"
2020
- name: Build Linux AMD64
2121
run: |
22-
make embedded-cluster-linux-amd64
22+
export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
23+
make embedded-cluster-linux-amd64 VERSION="${SHORT_SHA}"
2324
tar -C output/bin -czvf embedded-cluster-linux-amd64.tgz embedded-cluster
2425
- name: Output Metadata
2526
run: |
@@ -55,20 +56,20 @@ jobs:
5556
sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
5657
5758
# re-promote a release containing an old version of embedded-cluster to test upgrades
58-
replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "${SHORT_SHA}-pre-minio-removal"
59+
replicated release promote 807 2cHXb1RCttzpR0xvnNWyaZCgDBP --version "appver-${SHORT_SHA}-pre-minio-removal"
5960
60-
replicated release create --yaml-dir e2e/kots-release-install --promote CI --version "${SHORT_SHA}"
61-
replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "${SHORT_SHA}-upgrade"
61+
replicated release create --yaml-dir e2e/kots-release-install --promote CI --version "appver-${SHORT_SHA}"
62+
replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "appver-${SHORT_SHA}-upgrade"
6263
- name: Build CI binary
6364
run: |
6465
export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
6566
echo "# channel release object" > e2e/kots-release-install/release.yaml
6667
echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
6768
echo 'appSlug: "embedded-cluster-smoke-test-staging-app"' >> e2e/kots-release-install/release.yaml
68-
echo "versionLabel: \"${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
69+
echo "versionLabel: \"appver-${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
6970
cat e2e/kots-release-install/release.yaml
7071
cp output/bin/embedded-cluster output/bin/embedded-cluster-original
71-
make embedded-release # this is done after the metadata.json is generated so as to not include additional charts
72+
make embedded-release VERSION="${SHORT_SHA}" # this is done after the metadata.json is generated so as to not include additional charts
7273
- name: Cache files for integration test
7374
env:
7475
S3_BUCKET: "tf-staging-embedded-cluster-bin"
@@ -92,7 +93,7 @@ jobs:
9293
sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
9394
9495
rm e2e/kots-release-install/release.yaml
95-
replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "${SHORT_SHA}"
96+
replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "appver-${SHORT_SHA}"
9697
9798
- name: upload binary
9899
uses: actions/upload-artifact@v4

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ADMIN_CONSOLE_IMAGE_OVERRIDE =
99
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
1010
EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
1111
EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator
12-
EMBEDDED_OPERATOR_CHART_VERSION = 0.25.2
12+
EMBEDDED_OPERATOR_CHART_VERSION = 0.26.0
1313
EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:1.36.1
1414
OPENEBS_CHART_URL = https://openebs.github.io/charts
1515
OPENEBS_CHART_NAME = openebs/openebs

‎e2e/install_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ func TestSingleNodeAirgapInstallationUbuntuJammy(t *testing.T) {
422422

423423
t.Logf("%s: downloading airgap file", time.Now().Format(time.RFC3339))
424424
// download airgap bundle
425-
airgapURL := fmt.Sprintf("https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci-airgap/%s?airgap=true", os.Getenv("SHORT_SHA"))
425+
airgapURL := fmt.Sprintf("https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci-airgap/appver-%s?airgap=true", os.Getenv("SHORT_SHA"))
426426

427427
req, err := http.NewRequest("GET", airgapURL, nil)
428428
if err != nil {

‎e2e/scripts/check-postupgrade-state.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ main() {
3232
sleep 30 # wait for kubectl to become available
3333

3434
echo "upgrading to version ${installation_version}-upgrade"
35-
kubectl kots upstream upgrade embedded-cluster-smoke-test-staging-app --namespace kotsadm --deploy-version-label="${installation_version}-upgrade"
35+
kubectl kots upstream upgrade embedded-cluster-smoke-test-staging-app --namespace kotsadm --deploy-version-label="appver-${installation_version}-upgrade"
3636

3737
sleep 30
3838

‎e2e/scripts/single-node-airgap-install.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ main() {
191191
exit 1
192192
fi
193193

194-
# echo "ensure that installation is installed"
195-
# wait_for_installation
196-
# kubectl get installations --no-headers | grep -q "Installed"
194+
echo "ensure that installation is installed"
195+
wait_for_installation
196+
kubectl get installations --no-headers | grep -q "Installed"
197197
}
198198

199199
export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"

‎e2e/scripts/vandoor-prepare.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ main() {
1212
apt-get update
1313
apt-get install curl ca-certificates -y
1414

15-
echo "downloading from https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/${app_version_label}"
16-
curl "https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/${app_version_label}" -H "Authorization: ${license_id}" -o ec-release.tgz
15+
echo "downloading from https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/appver-${app_version_label}"
16+
curl "https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/appver-${app_version_label}" -H "Authorization: ${license_id}" -o ec-release.tgz
1717
tar xzf ec-release.tgz
1818

1919
mv embedded-cluster-smoke-test-staging-app /usr/local/bin/embedded-cluster

‎pkg/addons/adminconsole/adminconsole.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ func (a *AdminConsole) Outro(ctx context.Context, cli client.Client) error {
287287

288288
if _, err := helpers.RunCommand(kotsBinPath, installArgs...); err != nil {
289289
loading.Close()
290+
loading.Debugf("kubectl-kots %v", installArgs)
290291
return fmt.Errorf("unable to install the application: %w", err)
291292
}
292293

0 commit comments

Comments
 (0)