Skip to content

Commit df16fab

Browse files
sgalsalehsgalsaleh
committed
merge main
2 parents 6575758 + a23614c commit df16fab

File tree

12 files changed

+54
-35
lines changed

12 files changed

+54
-35
lines changed

‎cmd/buildtools/addon.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,3 +189,7 @@ func (c *addonComponent) getPackageNameAndVersion(ctx context.Context, upstreamV
189189
func latestPatchVersion(s *semver.Version) string {
190190
return fmt.Sprintf("%d.%d", s.Major(), s.Minor())
191191
}
192+
193+
func latestMinorVersion(s *semver.Version) string {
194+
return fmt.Sprintf("%d", s.Major())
195+
}

‎cmd/buildtools/k0s.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,11 @@ func getK0sVersion() (*semver.Version, error) {
119119
}
120120

121121
func getCalicoVersion(opts addonComponentOptions) string {
122-
// k0s < 1.32 is not compatible with calico 3.29+
122+
// k0s < 1.32 does not work with calico 3.29+ images due to missing rbac
123+
// permissions in the manifests that k0s uses to deploy calico.
123124
if opts.k0sVersion.LessThan(semver.MustParse("1.32")) {
124125
return "3.28"
125126
}
126-
return latestPatchVersion(opts.upstreamVersion)
127+
// latest minor version that wolfi supports
128+
return latestMinorVersion(opts.upstreamVersion)
127129
}

‎cmd/buildtools/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func ResolveApkoPackageVersion(componentName, packageName, packageVersion string
148148
cmd := exec.Command("make", args...)
149149
out, err := cmd.Output()
150150
if err != nil {
151-
return "", fmt.Errorf("run command: %w", err)
151+
return "", fmt.Errorf("run command: %w: %s", err, string(out))
152152
}
153153
return strings.TrimSpace(string(out)), nil
154154
}

‎deploy/images/calico-cni/apko.tmpl.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ contents:
55
keyring:
66
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
77
packages:
8-
- calico-cni
9-
- calico-cni-compat
8+
- calico-cni~${PACKAGE_VERSION}
9+
- calico-cni-compat~${PACKAGE_VERSION}
1010

1111
accounts:
1212
groups:

‎deploy/images/calico-kube-controllers/apko.tmpl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ contents:
55
keyring:
66
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
77
packages:
8-
- calico-kube-controllers
8+
- calico-kube-controllers~${PACKAGE_VERSION}
99

1010
accounts:
1111
groups:

‎deploy/images/calico-node/apko.tmpl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ contents:
66
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
77
packages:
88
- busybox
9-
- calico-node
9+
- calico-node~${PACKAGE_VERSION}
1010

1111
accounts:
1212
groups:

‎deploy/images/seaweedfs/apko.tmpl.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ contents:
66
keyring:
77
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
88
packages:
9-
- wolfi-base
9+
- busybox-full # busybox wget needed for seaweedfs-bucket-hook, wget from package repos does not work
1010
- seaweedfs~${PACKAGE_VERSION}
1111
- fuse3 # for weed mount
12-
- wget # for seaweedfs-bucket-hook
1312

1413
accounts:
1514
groups:

‎pkg/addons/adminconsole/static/metadata.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
# $ make buildtools
66
# $ output/bin/buildtools update addon <addon name>
77
#
8-
version: 1.124.2
8+
version: 1.124.3
99
location: oci://proxy.replicated.com/anonymous/registry.replicated.com/library/admin-console
1010
images:
1111
kotsadm:
1212
repo: proxy.replicated.com/anonymous/kotsadm/kotsadm
1313
tag:
14-
amd64: v1.124.2-amd64@sha256:a216a7cbbf399cf3a7c9039854e26c0cc7bff6f703a44bbea50b1033bdb04f72
15-
arm64: v1.124.2-arm64@sha256:b62b4a39ced313818e61fa7d6aa52a2e1eba86ad60eca2d32e99c8a25acca7f1
14+
amd64: v1.124.3-amd64@sha256:2a14cb0395c21ea968fbf80db253e0065770a179d0ae0a5e1015481bac9aae37
15+
arm64: v1.124.3-arm64@sha256:20bc1d693fff6c1bec7c696489ddf8f84a3df8a1ca8ebf96c4ab1d0edcadf495
1616
kotsadm-migrations:
1717
repo: proxy.replicated.com/anonymous/kotsadm/kotsadm-migrations
1818
tag:
19-
amd64: v1.124.2-amd64@sha256:acd06288ab0b765eb6be1f3f26ebdf113fee4a4a16e09a3a63f0640a07ba65cb
20-
arm64: v1.124.2-arm64@sha256:a85a3c36179a882c36836672005dfbf3397d50af334397b58c8e76025bee00d8
19+
amd64: v1.124.3-amd64@sha256:b2daab5d79d4771f15fe171d72de6344db16423ed338d4dd12e426db1e80655e
20+
arm64: v1.124.3-arm64@sha256:963915a326f6a27b3a3ef567d31db2c5f4e97191d9b15d8703812d5960475f88
2121
kurl-proxy:
2222
repo: proxy.replicated.com/anonymous/kotsadm/kurl-proxy
2323
tag:
24-
amd64: v1.124.2-amd64@sha256:94a6535edfafb37bb253285e9a4382c2b24a33b777dadae4a5c66863a2514a05
25-
arm64: v1.124.2-arm64@sha256:5bd6e3a3e93d2318900553bcb8a3f2c83210af8a75fbcae5a9df1ca982dda2bb
24+
amd64: v1.124.3-amd64@sha256:d8a76bd82f6865338fdc7df969cf4491cdd1274b0440e5e68175338fd321cefc
25+
arm64: v1.124.3-arm64@sha256:3549585062260eb1ddee002ca466b5e51e97423bb1e134e42bbb72419de2549c
2626
rqlite:
2727
repo: proxy.replicated.com/anonymous/kotsadm/rqlite
2828
tag:
29-
amd64: 8.36.10-r0-amd64@sha256:6eb9ab620632fc3e1697bc8619fe5f2fe3d5a6fa19b6e3f84b35cca1f6254ef3
30-
arm64: 8.36.10-r0-arm64@sha256:259569537110f8c1409863fb35868925f1c3b482689d11b4225285f361c1259d
29+
amd64: 8.36.11-r0-amd64@sha256:a6cd95f6e7c80f35738ffd3f8eeea651c493c8d43553a04f1dd35fcea39887fc
30+
arm64: 8.36.11-r0-arm64@sha256:509862e3feed4f131b20c29a71a6ba0928149ffcc6aea9c41e179d92df231aac

‎pkg/addons/registry/static/metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ images:
1111
registry:
1212
repo: proxy.replicated.com/anonymous/replicated/ec-registry
1313
tag:
14-
amd64: 2.8.3-r0@sha256:5b76ebd0a362009e31a05ac487c690f5ece0e11f6c4d9261ca63a3f162b57660
14+
amd64: 2.8.3-r0@sha256:16c54803632719d1ac2c5606748b5dc3af636ff3761fff95d4330358c86393d7
1515
arm64: 2.8.3-r0-arm64@sha256:e9841478ded46f9ed3f258ea7b291718954cecce2d6907df778d223dded2dd9d

‎pkg/addons/seaweedfs/install.go‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (s *SeaweedFS) createPreRequisites(ctx context.Context, kcli client.Client)
4646
return errors.Wrap(err, "create namespace")
4747
}
4848

49-
if err := createService(ctx, kcli, s.ServiceCIDR); err != nil {
49+
if err := ensureService(ctx, kcli, s.ServiceCIDR); err != nil {
5050
return errors.Wrap(err, "create s3 service")
5151
}
5252

@@ -69,7 +69,7 @@ func createNamespace(ctx context.Context, kcli client.Client, namespace string)
6969
return nil
7070
}
7171

72-
func createService(ctx context.Context, kcli client.Client, serviceCIDR string) error {
72+
func ensureService(ctx context.Context, kcli client.Client, serviceCIDR string) error {
7373
if serviceCIDR == "" {
7474
return errors.New("service CIDR not present")
7575
}
@@ -100,6 +100,20 @@ func createService(ctx context.Context, kcli client.Client, serviceCIDR string)
100100

101101
obj.ObjectMeta.Labels = ApplyLabels(obj.ObjectMeta.Labels, "s3")
102102

103+
var existingObj corev1.Service
104+
if err := kcli.Get(ctx, client.ObjectKey{Name: obj.Name, Namespace: obj.Namespace}, &existingObj); err != nil && !k8serrors.IsNotFound(err) {
105+
return errors.Wrap(err, "get s3 service")
106+
} else if err == nil {
107+
// if the service already exists and has the correct cluster IP, do not recreate it
108+
if existingObj.Spec.ClusterIP == clusterIP {
109+
return nil
110+
}
111+
err := kcli.Delete(ctx, &existingObj)
112+
if err != nil {
113+
return errors.Wrap(err, "delete existing s3 service")
114+
}
115+
}
116+
103117
if err := kcli.Create(ctx, obj); err != nil && !k8serrors.IsAlreadyExists(err) {
104118
return errors.Wrap(err, "create s3 service")
105119
}

0 commit comments

Comments
 (0)