Skip to content

Commit 077e38f

Browse files
laveryalaverya
committed
Merge remote-tracking branch 'origin/main' into k0s-1-28-10
2 parents 91c840e + e1dd9be commit 077e38f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2023
-319
lines changed

‎.github/workflows/dependencies.yaml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,6 @@ jobs:
2727
run: |
2828
export VERSION=`curl https://raw.githubusercontent.com/docker-library/busybox/master/versions.json | jq -r .latest.version`
2929
sed -i "/^EMBEDDED_OPERATOR_UTILS_IMAGE/c\EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:$VERSION" Makefile
30-
- name: OpenEBS
31-
run: |
32-
export VERSION=`curl https://api.github.com/repos/openebs/openebs/releases/latest | jq -r .name | tr -d v`
33-
sed -i "/^OPENEBS_CHART_VERSION/c\OPENEBS_CHART_VERSION = $VERSION" Makefile
34-
- name: OpenEBS utils
35-
run: |
36-
export VERSION=`curl https://api.github.com/repos/openebs/linux-utils/releases/latest | jq -r .name | tr -d v`
37-
sed -i "/^OPENEBS_UTILS_VERSION/c\OPENEBS_UTILS_VERSION = $VERSION" Makefile
38-
- name: SeaweedFS
39-
run: |
40-
export VERSION=`curl https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/k8s/charts/seaweedfs/Chart.yaml | grep version | tr -d 'version: '`
41-
sed -i "/^SEAWEEDFS_CHART_VERSION/c\SEAWEEDFS_CHART_VERSION = $VERSION" Makefile
42-
- name: Registry Chart
43-
run: |
44-
export VERSION=`curl https://api.github.com/repos/twuni/docker-registry.helm/tags | jq -r .[].name | head -1 | tr -d v`
45-
sed -i "/^REGISTRY_CHART_VERSION/c\REGISTRY_CHART_VERSION = $VERSION" Makefile
46-
- name: Registry Image
47-
run: |
48-
export VERSION=`curl https://api.github.com/repos/distribution/distribution/tags | jq -r '.[].name' | tr -d v | grep -v alpha | grep -v beta | head -n 1`
49-
sed -i "/^REGISTRY_IMAGE_VERSION/c\REGISTRY_IMAGE_VERSION = $VERSION" Makefile
50-
- name: Velero Chart
51-
run: |
52-
export VERSION=`curl https://api.github.com/repos/vmware-tanzu/helm-charts/tags | jq -r '.[].name' | grep velero | tr -d 'velero-' | head -n 1`
53-
sed -i "/^VELERO_CHART_VERSION/c\VELERO_CHART_VERSION = $VERSION" Makefile
54-
- name: Velero Image
55-
run: |
56-
export VERSION=`curl https://api.github.com/repos/vmware-tanzu/velero/tags | jq -r '.[].name' | grep -v 'rc' | head -n 1`
57-
sed -i "/^VELERO_IMAGE_VERSION/c\VELERO_IMAGE_VERSION = $VERSION" Makefile
58-
- name: Velero AWS Plugin Image
59-
run: |
60-
export VERSION=`curl https://api.github.com/repos/vmware-tanzu/velero-plugin-for-aws/tags | jq -r '.[].name' | grep -v 'rc' | head -n 1`
61-
sed -i "/^VELERO_AWS_PLUGIN_IMAGE_VERSION/c\VELERO_AWS_PLUGIN_IMAGE_VERSION = $VERSION" Makefile
6230
- name: Kubectl
6331
run: |
6432
export VERSION=`curl -L -s https://dl.k8s.io/release/stable.txt`

‎.github/workflows/mirror-helm-charts.yaml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Update Addons
2+
on:
3+
schedule:
4+
# everyday at 1 o'clock.
5+
- cron: '0 1 * * *'
6+
workflow_dispatch: {}
7+
jobs:
8+
build:
9+
name: Build
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out repo
13+
uses: actions/checkout@v4
14+
- name: Set up Go
15+
uses: actions/setup-go@v5
16+
with:
17+
go-version-file: go.mod
18+
- name: Compile buildtools
19+
run: |
20+
make buildtools
21+
- name: Upload buildtools artifact
22+
uses: actions/upload-artifact@v4
23+
with:
24+
name: buildtools
25+
path: output/bin/buildtools
26+
update-dependencies:
27+
runs-on: ubuntu-latest
28+
needs:
29+
- build
30+
strategy:
31+
fail-fast: false
32+
matrix:
33+
addon:
34+
- openebs
35+
- registry
36+
- seaweedfs
37+
- velero
38+
steps:
39+
- name: Check out repo
40+
uses: actions/checkout@v4
41+
- name: Download buildtools artifact
42+
uses: actions/download-artifact@v4
43+
with:
44+
name: buildtools
45+
path: ./output/artifacts
46+
- name: Update ${{ matrix.addon }}
47+
id: update
48+
env:
49+
REGISTRY_SERVER: registry.replicated.com
50+
REGISTRY_USER: ${{ secrets.REGISTRY_USERNAME_PRODUCTION }}
51+
REGISTRY_PASS: ${{ secrets.REGISTRY_PASSWORD_PRODUCTION }}
52+
DESTINATION: oci://registry.replicated.com/ec-charts
53+
run: |
54+
chmod 755 ./output/artifacts/buildtools
55+
./output/artifacts/buildtools update addon ${{ matrix.addon }}
56+
- name: Create Pull Request
57+
uses: peter-evans/create-pull-request@v6
58+
with:
59+
token: ${{ secrets.AUTOMATED_PR_GH_PAT }}
60+
commit-message: updated ${{ matrix.addon }} version
61+
title: "feat: update ${{ matrix.addon }} version"
62+
branch: automation/update-makefile-${{ matrix.addon }}
63+
delete-branch: true
64+
labels: |
65+
automated-pr
66+
type::chore
67+
draft: false
68+
base: "main"
69+
body: |
70+
Automated changes by the [cron-mirror-helm-charts](https://github.com/replicatedhq/embedded-cluster/blob/main/.github/workflows/mirror-helm-charts.yaml) GitHub action

‎.github/workflows/pull-request.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,11 @@ jobs:
212212
- TestMaterialize
213213
- TestLocalArtifactMirror
214214
- TestSingleNodeAirgapUpgrade
215+
- TestSingleNodeAirgapUpgradeCustomCIDR
215216
- TestInstallSnapshotFromReplicatedApp
216217
- TestMultiNodeAirgapUpgrade
217218
- TestSingleNodeDisasterRecovery
219+
- TestSingleNodeDisasterRecoveryWithProxy
218220
- TestSingleNodeResumeDisasterRecovery
219221
- TestSingleNodeAirgapDisasterRecovery
220222
- TestMultiNodeHAInstallation
@@ -223,6 +225,8 @@ jobs:
223225
- TestProxiedEnvironment
224226
- TestMultiNodeHADisasterRecovery
225227
- TestMultiNodeAirgapHADisasterRecovery
228+
- TestCustomCIDR
229+
- TestProxiedCustomCIDR
226230
include:
227231
- test: TestMultiNodeAirgapUpgrade
228232
runner: embedded-cluster

‎.github/workflows/release-dev.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,11 @@ jobs:
164164
- TestMaterialize
165165
- TestLocalArtifactMirror
166166
- TestSingleNodeAirgapUpgrade
167+
- TestSingleNodeAirgapUpgradeCustomCIDR
167168
- TestInstallSnapshotFromReplicatedApp
168169
- TestMultiNodeAirgapUpgrade
169170
- TestSingleNodeDisasterRecovery
171+
- TestSingleNodeDisasterRecoveryWithProxy
170172
- TestSingleNodeResumeDisasterRecovery
171173
- TestSingleNodeAirgapDisasterRecovery
172174
- TestMultiNodeHAInstallation
@@ -175,6 +177,8 @@ jobs:
175177
- TestProxiedEnvironment
176178
- TestMultiNodeHADisasterRecovery
177179
- TestMultiNodeAirgapHADisasterRecovery
180+
- TestCustomCIDR
181+
- TestProxiedCustomCIDR
178182
include:
179183
- test: TestMultiNodeAirgapUpgrade
180184
runner: embedded-cluster

‎Makefile

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,20 @@ VERSION ?= $(shell git describe --tags --dirty)
22
UNAME := $(shell uname)
33
ARCH := $(shell uname -m)
44
APP_NAME = embedded-cluster
5-
ADMIN_CONSOLE_CHART_URL = oci://registry.replicated.com/library
6-
ADMIN_CONSOLE_CHART_NAME = admin-console
7-
ADMIN_CONSOLE_CHART_VERSION = 1.109.13
5+
ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
6+
ADMIN_CONSOLE_CHART_VERSION = 1.111.0
87
ADMIN_CONSOLE_IMAGE_OVERRIDE =
98
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
109
EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
1110
EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator
12-
EMBEDDED_OPERATOR_CHART_VERSION = 0.36.2
11+
EMBEDDED_OPERATOR_CHART_VERSION = 0.36.5
1312
EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:1.36.1
1413
EMBEDDED_CLUSTER_OPERATOR_IMAGE_OVERRIDE =
15-
OPENEBS_CHART_URL = https://openebs.github.io/openebs
16-
OPENEBS_CHART_NAME = openebs/openebs
17-
OPENEBS_CHART_VERSION = 4.0.1
18-
OPENEBS_UTILS_VERSION = 4.0.0
19-
SEAWEEDFS_CHART_URL = https://seaweedfs.github.io/seaweedfs/helm
20-
SEAWEEDFS_CHART_NAME = seaweedfs/seaweedfs
21-
SEAWEEDFS_CHART_VERSION = 3.68.0
22-
REGISTRY_CHART_URL = https://helm.twun.io
23-
REGISTRY_CHART_NAME = twuni/docker-registry
14+
OPENEBS_CHART_VERSION = 4.1.0
15+
OPENEBS_UTILS_VERSION = 4.1.0
16+
SEAWEEDFS_CHART_VERSION = 4.0.0
2417
REGISTRY_CHART_VERSION = 2.2.3
2518
REGISTRY_IMAGE_VERSION = 2.8.3
26-
VELERO_CHART_URL = https://vmware-tanzu.github.io/helm-charts
27-
VELERO_CHART_NAME = vmware-tanzu/velero
2819
VELERO_CHART_VERSION = 6.3.0
2920
VELERO_IMAGE_VERSION = v1.13.2
3021
VELERO_AWS_PLUGIN_IMAGE_VERSION = v1.9.2
@@ -44,30 +35,19 @@ LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$
4435
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.TroubleshootVersion=$(TROUBLESHOOT_VERSION) \
4536
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.KubectlVersion=$(KUBECTL_VERSION) \
4637
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.LocalArtifactMirrorImage=$(LOCAL_ARTIFACT_MIRROR_IMAGE_LOCATION) \
47-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartURL=$(ADMIN_CONSOLE_CHART_URL) \
48-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartName=$(ADMIN_CONSOLE_CHART_NAME) \
38+
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartRepoOverride=$(ADMIN_CONSOLE_CHART_REPO_OVERRIDE) \
4939
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.Version=$(ADMIN_CONSOLE_CHART_VERSION) \
5040
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ImageOverride=$(ADMIN_CONSOLE_IMAGE_OVERRIDE) \
5141
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.MigrationsImageOverride=$(ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE) \
5242
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.KotsVersion=$(KOTS_VERSION) \
53-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.ChartURL=$(EMBEDDED_OPERATOR_CHART_URL) \
54-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.ChartName=$(EMBEDDED_OPERATOR_CHART_NAME) \
5543
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.Version=$(EMBEDDED_OPERATOR_CHART_VERSION) \
5644
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.UtilsImage=$(EMBEDDED_OPERATOR_UTILS_IMAGE) \
5745
-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.ImageOverride=$(EMBEDDED_CLUSTER_OPERATOR_IMAGE_OVERRIDE) \
58-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.ChartURL=$(OPENEBS_CHART_URL) \
59-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.ChartName=$(OPENEBS_CHART_NAME) \
6046
-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.Version=$(OPENEBS_CHART_VERSION) \
6147
-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.UtilsVersion=$(OPENEBS_UTILS_VERSION) \
62-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/seaweedfs.ChartURL=$(SEAWEEDFS_CHART_URL) \
63-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/seaweedfs.ChartName=$(SEAWEEDFS_CHART_NAME) \
6448
-X github.com/replicatedhq/embedded-cluster/pkg/addons/seaweedfs.Version=$(SEAWEEDFS_CHART_VERSION) \
65-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/registry.ChartURL=$(REGISTRY_CHART_URL) \
66-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/registry.ChartName=$(REGISTRY_CHART_NAME) \
6749
-X github.com/replicatedhq/embedded-cluster/pkg/addons/registry.Version=$(REGISTRY_CHART_VERSION) \
6850
-X github.com/replicatedhq/embedded-cluster/pkg/addons/registry.ImageVersion=$(REGISTRY_IMAGE_VERSION) \
69-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/velero.ChartURL=$(VELERO_CHART_URL) \
70-
-X github.com/replicatedhq/embedded-cluster/pkg/addons/velero.ChartName=$(VELERO_CHART_NAME) \
7151
-X github.com/replicatedhq/embedded-cluster/pkg/addons/velero.Version=$(VELERO_CHART_VERSION) \
7252
-X github.com/replicatedhq/embedded-cluster/pkg/addons/velero.VeleroTag=$(VELERO_IMAGE_VERSION) \
7353
-X github.com/replicatedhq/embedded-cluster/pkg/addons/velero.AwsPluginTag=$(VELERO_AWS_PLUGIN_IMAGE_VERSION)
@@ -209,3 +189,7 @@ push-local-artifact-mirror-image:
209189

210190
.PHONY: build-and-push-local-artifact-mirror-image
211191
build-and-push-local-artifact-mirror-image: build-local-artifact-mirror-image push-local-artifact-mirror-image
192+
193+
.PHONY: buildtools
194+
buildtools:
195+
go build -o ./output/bin/buildtools ./cmd/buildtools

‎cmd/buildtools/addon.go

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package main
2+
3+
import (
4+
"github.com/urfave/cli/v2"
5+
)
6+
7+
var addonCommand = &cli.Command{
8+
Name: "update",
9+
Usage: "Manage the embedded cluster addons",
10+
Flags: []cli.Flag{
11+
&cli.BoolFlag{
12+
Name: "force",
13+
Usage: "Pushes the addon chart even if no new version was found",
14+
},
15+
},
16+
Subcommands: []*cli.Command{
17+
updateAddonCommand,
18+
},
19+
}
20+
21+
var updateAddonCommand = &cli.Command{
22+
Name: "addon",
23+
Usage: "Update an embedded cluster addon by copying the chart to the Replicated registry and setting the version in the Makefile",
24+
Subcommands: []*cli.Command{
25+
updateOpenEBSAddonCommand,
26+
updateSeaweedFSAddonCommand,
27+
updateRegistryAddonCommand,
28+
updateVeleroAddonCommand,
29+
},
30+
}

0 commit comments

Comments
 (0)