Skip to content

Commit 763f60e

Browse files
Rakshitha-KamathRakshitha-Kamath
Rakshitha-Kamath
authored and
Rakshitha-Kamath
committed
This PR contains the change to support a different way to install helm.
Signed-off-by: Rakshitha-Kamath <[email protected]>
1 parent e178469 commit 763f60e

File tree

9 files changed

+1559
-2344
lines changed

9 files changed

+1559
-2344
lines changed

‎.tekton/alloy-9-0-pull-request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ spec:
8787
description: Execute the build with network isolation
8888
name: hermetic
8989
type: string
90-
- default: '[{"type": "gomod", "path": "."}, {"type": "npm", "path": "yarn-install"}, {"type": "generic", "path": "."}, {"type": "yarn", "path": "alloy/internal/web/ui"}, {"type": "gomod", "path": "alloy"}, {"type": "rpm", "path": "."}]'
90+
- default: '[{"type": "gomod", "path": "."}, {"type": "npm", "path": "yarn-install"}, {"type": "yarn", "path": "alloy/internal/web/ui"}, {"type": "gomod", "path": "alloy"}, {"type": "rpm", "path": "."}]'
9191
description: Build dependencies to be prefetched by Cachi2
9292
name: prefetch-input
9393
type: string

‎.tekton/alloy-9-0-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ spec:
8484
description: Execute the build with network isolation
8585
name: hermetic
8686
type: string
87-
- default: '[{"type": "gomod", "path": "."}, {"type": "npm", "path": "yarn-install"}, {"type": "generic", "path": "."}, {"type": "yarn", "path": "alloy/internal/web/ui"}, {"type": "gomod", "path": "alloy"}, {"type": "rpm", "path": "."}]'
87+
- default: '[{"type": "gomod", "path": "."}, {"type": "npm", "path": "yarn-install"}, {"type": "yarn", "path": "alloy/internal/web/ui"}, {"type": "gomod", "path": "alloy"}, {"type": "rpm", "path": "."}]'
8888
description: Build dependencies to be prefetched by Cachi2
8989
name: prefetch-input
9090
type: string

‎Dockerfile‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@ COPY yarn-install .
88
RUN npm install --offline
99
RUN ln -s $PWD/node_modules/yarn/bin/yarn /usr/local/bin/yarn
1010

11+
# Building the helm binary using go
12+
RUN if [ -f /cachi2/cachi2.env ]; then . /cachi2/cachi2.env; fi && \
13+
go build -o /usr/bin/helm helm.sh/helm/[email protected]/cmd/helm
14+
15+
# Let's build helm
16+
#RUN git clone https://github.com/helm/helm.git \
17+
# && cd helm \
18+
# && make \
19+
# && cd -
20+
21+
#COPY ./helm/bin/helm /usr/bin/helm
22+
1123
RUN yum install -y systemd-devel \
1224
&& dnf module reset -y nodejs \
1325
&& node -v \
1426
&& yarn -v
1527

16-
# Helm installation as per https://helm.sh/docs/intro/install/
17-
RUN tar -zxvf /cachi2/output/deps/generic/helm-linux-${BUILDPLATFORM}.tar.gz \
18-
&& mv ./linux-${BUILDPLATFORM}/helm /usr/bin/helm
19-
2028
COPY . /src
2129
WORKDIR /src/alloy/internal/web/ui/
2230
RUN yarn install --offline --frozen-lockfile --ignore-scripts && yarn run --offline build

‎artifacts.lock.yaml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
metadata:
33
version: "1.0"
44
artifacts:
5-
- download_url: "https://get.helm.sh/helm-v3.19.0-linux-amd64.tar.gz"
6-
checksum: "sha256:a7f81ce08007091b86d8bd696eb4d86b8d0f2e1b9f6c714be62f82f96a594496"
7-
filename: "helm-linux-amd64.tar.gz"
8-
- download_url: "https://get.helm.sh/helm-v3.19.0-linux-arm64.tar.gz"
9-
checksum: "sha256:440cf7add0aee27ebc93fada965523c1dc2e0ab340d4348da2215737fc0d76ad"
10-
filename: "helm-linux-arm64.tar.gz"
11-
- download_url: "https://get.helm.sh/helm-v3.19.0-linux-ppc64le.tar.gz"
12-
checksum: "sha256:f57ea04d7fa62cc3e90a831eb67edb1400c810df6083875bee3a7c195a795ce4"
13-
filename: "helm-linux-ppc64le.tar.gz"
14-
- download_url: "https://get.helm.sh/helm-v3.19.0-linux-s390x.tar.gz"
15-
checksum: "sha256:0dff2f249f71690e3b420ebb5efc573eb26a51b4a614c4391c8c7fa3e47863f2"
16-
filename: "helm-linux-s390x.tar.gz"
5+
- download_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"
6+
checksum: "sha256:fcf0eab4f05a1c0de6363ac4b707600a27a9d774e9b491059e59e6921b255a84"
7+
filename: "RPM-GPG-KEY-EPEL-9"
8+

‎epel.repo‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[epel]
2+
name=Extra Packages for Enterprise Linux 9 - $basearch
3+
baseurl=https://download.fedoraproject.org/pub/epel/9/Everything/$basearch/
4+
enabled=1
5+
gpgcheck=1
6+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-9
7+
8+
[epel-debuginfo]
9+
name=Extra Packages for Enterprise Linux 9 - $basearch - Debug
10+
baseurl=https://download.fedoraproject.org/pub/epel/9/Everything/$basearch/debug/
11+
enabled=0
12+
gpgcheck=1
13+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-9
14+
15+
[epel-source]
16+
name=Extra Packages for Enterprise Linux 9 - $basearch - Source
17+
baseurl=https://download.fedoraproject.org/pub/epel/9/Everything/$basearch/Source/
18+
enabled=0
19+
gpgcheck=1
20+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-9

‎go.mod‎

Lines changed: 112 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,95 +3,168 @@ module alloy-builder
33
go 1.24.6
44

55
require (
6+
dario.cat/mergo v1.0.1 // indirect
7+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
8+
github.com/BurntSushi/toml v1.5.0 // indirect
9+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
610
github.com/Masterminds/goutils v1.1.1 // indirect
711
github.com/Masterminds/semver v1.5.0 // indirect
8-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
9-
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
12+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
13+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
14+
github.com/Masterminds/squirrel v1.5.4 // indirect
15+
github.com/Masterminds/vcs v1.13.3 // indirect
1016
github.com/Songmu/retry v0.1.0 // indirect
1117
github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20220618162802-424739b250f5 // indirect
1218
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
1319
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
20+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
21+
github.com/blang/semver/v4 v4.0.0 // indirect
22+
github.com/chai2010/gettext-go v1.0.2 // indirect
23+
github.com/containerd/containerd v1.7.29 // indirect
24+
github.com/containerd/errdefs v0.3.0 // indirect
25+
github.com/containerd/log v0.1.0 // indirect
26+
github.com/containerd/platforms v0.2.1 // indirect
27+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
28+
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
29+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
30+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
31+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
32+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
1433
github.com/fatih/color v1.13.0 // indirect
1534
github.com/fatih/structs v1.1.0 // indirect
16-
github.com/fsnotify/fsnotify v1.4.7 // indirect
35+
github.com/fsnotify/fsnotify v1.9.0 // indirect
36+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
1737
github.com/go-clix/cli v0.2.0 // indirect
18-
github.com/go-logr/logr v1.2.2 // indirect
38+
github.com/go-errors/errors v1.4.2 // indirect
39+
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
40+
github.com/go-logr/logr v1.4.2 // indirect
41+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
42+
github.com/go-openapi/jsonreference v0.20.2 // indirect
43+
github.com/go-openapi/swag v0.23.0 // indirect
1944
github.com/gobuffalo/flect v0.2.5 // indirect
2045
github.com/gobwas/glob v0.2.3 // indirect
21-
github.com/gogo/protobuf v1.3.0 // indirect
22-
github.com/golang/protobuf v1.3.1 // indirect
46+
github.com/gofrs/flock v0.12.1 // indirect
47+
github.com/gogo/protobuf v1.3.2 // indirect
48+
github.com/golang/protobuf v1.5.4 // indirect
49+
github.com/google/btree v1.1.3 // indirect
50+
github.com/google/gnostic-models v0.7.0 // indirect
51+
github.com/google/go-cmp v0.7.0 // indirect
2352
github.com/google/go-github v17.0.0+incompatible // indirect
2453
github.com/google/go-jsonnet v0.18.0 // indirect
2554
github.com/google/go-querystring v1.1.0 // indirect
26-
github.com/google/gofuzz v1.1.0 // indirect
27-
github.com/google/uuid v1.3.0 // indirect
55+
github.com/google/gofuzz v1.2.0 // indirect
56+
github.com/google/uuid v1.6.0 // indirect
57+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
58+
github.com/gosuri/uitable v0.0.4 // indirect
2859
github.com/grafana/tanka v0.10.0 // indirect
60+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
2961
github.com/hashicorp/errwrap v1.1.0 // indirect
3062
github.com/hashicorp/go-multierror v1.1.1 // indirect
3163
github.com/hashicorp/go-version v1.3.0 // indirect
3264
github.com/hashicorp/hcl v1.0.0 // indirect
33-
github.com/huandu/xstrings v1.3.2 // indirect
34-
github.com/imdario/mergo v0.3.12 // indirect
35-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
65+
github.com/huandu/xstrings v1.5.0 // indirect
66+
github.com/imdario/mergo v0.3.13 // indirect
67+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
68+
github.com/jmoiron/sqlx v1.4.0 // indirect
69+
github.com/josharian/intern v1.0.0 // indirect
3670
github.com/json-iterator/go v1.1.12 // indirect
3771
github.com/jsonnet-bundler/jsonnet-bundler v0.5.1 // indirect
3872
github.com/karrick/godirwalk v1.16.1 // indirect
73+
github.com/klauspost/compress v1.18.0 // indirect
3974
github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
75+
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
76+
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
77+
github.com/lib/pq v1.10.9 // indirect
78+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
4079
github.com/magiconair/properties v1.8.0 // indirect
41-
github.com/mattn/go-colorable v0.1.12 // indirect
42-
github.com/mattn/go-isatty v0.0.14 // indirect
80+
github.com/mailru/easyjson v0.7.7 // indirect
81+
github.com/mattn/go-colorable v0.1.13 // indirect
82+
github.com/mattn/go-isatty v0.0.17 // indirect
83+
github.com/mattn/go-runewidth v0.0.9 // indirect
4384
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
4485
github.com/mitchellh/copystructure v1.2.0 // indirect
86+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
4587
github.com/mitchellh/gox v1.0.1 // indirect
4688
github.com/mitchellh/iochan v1.0.0 // indirect
4789
github.com/mitchellh/mapstructure v1.1.2 // indirect
4890
github.com/mitchellh/reflectwalk v1.0.2 // indirect
91+
github.com/moby/spdystream v0.5.0 // indirect
92+
github.com/moby/term v0.5.2 // indirect
4993
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
50-
github.com/modern-go/reflect2 v1.0.2 // indirect
94+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
95+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
96+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
97+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
5198
github.com/norwoodj/helm-docs v1.11.0 // indirect
52-
github.com/pelletier/go-toml v1.2.0 // indirect
99+
github.com/opencontainers/go-digest v1.0.0 // indirect
100+
github.com/opencontainers/image-spec v1.1.1 // indirect
101+
github.com/pelletier/go-toml v1.9.5 // indirect
102+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
53103
github.com/pkg/errors v0.9.1 // indirect
104+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
54105
github.com/posener/complete v1.2.3 // indirect
106+
github.com/rubenv/sql-migrate v1.8.0 // indirect
55107
github.com/russross/blackfriday/v2 v2.1.0 // indirect
56-
github.com/shopspring/decimal v1.3.1 // indirect
57-
github.com/sirupsen/logrus v1.4.2 // indirect
108+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
109+
github.com/shopspring/decimal v1.4.0 // indirect
110+
github.com/sirupsen/logrus v1.9.3 // indirect
58111
github.com/spf13/afero v1.2.2 // indirect
59-
github.com/spf13/cast v1.4.1 // indirect
60-
github.com/spf13/cobra v1.4.0 // indirect
112+
github.com/spf13/cast v1.7.0 // indirect
113+
github.com/spf13/cobra v1.10.1 // indirect
61114
github.com/spf13/jwalterweatherman v1.0.0 // indirect
62-
github.com/spf13/pflag v1.0.5 // indirect
115+
github.com/spf13/pflag v1.0.10 // indirect
63116
github.com/spf13/viper v1.4.0 // indirect
64-
github.com/stretchr/objx v0.4.0 // indirect
117+
github.com/stretchr/objx v0.5.2 // indirect
65118
github.com/tcnksm/ghr v0.13.0 // indirect
66119
github.com/tcnksm/go-gitconfig v0.1.2 // indirect
67120
github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e // indirect
68121
github.com/thoas/go-funk v0.9.2 // indirect
69-
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
70-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
71-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
72-
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
73-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
74-
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
75-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
76-
golang.org/x/text v0.3.7 // indirect
77-
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
122+
github.com/x448/float16 v0.8.4 // indirect
123+
github.com/xlab/treeprint v1.2.0 // indirect
124+
go.yaml.in/yaml/v2 v2.4.2 // indirect
125+
go.yaml.in/yaml/v3 v3.0.4 // indirect
126+
golang.org/x/crypto v0.43.0 // indirect
127+
golang.org/x/mod v0.28.0 // indirect
128+
golang.org/x/net v0.45.0 // indirect
129+
golang.org/x/oauth2 v0.30.0 // indirect
130+
golang.org/x/sync v0.17.0 // indirect
131+
golang.org/x/sys v0.37.0 // indirect
132+
golang.org/x/term v0.36.0 // indirect
133+
golang.org/x/text v0.30.0 // indirect
134+
golang.org/x/time v0.12.0 // indirect
135+
golang.org/x/tools v0.37.0 // indirect
78136
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
79137
google.golang.org/appengine v1.6.7 // indirect
80-
google.golang.org/protobuf v1.26.0-rc.1 // indirect
138+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
139+
google.golang.org/grpc v1.72.1 // indirect
140+
google.golang.org/protobuf v1.36.5 // indirect
81141
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
142+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
82143
gopkg.in/inf.v0 v0.9.1 // indirect
83144
gopkg.in/yaml.v2 v2.4.0 // indirect
84145
gopkg.in/yaml.v3 v3.0.1 // indirect
85-
k8s.io/api v0.16.16-rc.0 // indirect
86-
k8s.io/apiextensions-apiserver v0.16.16-rc.0 // indirect
87-
k8s.io/apimachinery v0.16.16-rc.0 // indirect
146+
helm.sh/helm/v3 v3.19.2 // indirect
147+
k8s.io/api v0.34.0 // indirect
148+
k8s.io/apiextensions-apiserver v0.34.0 // indirect
149+
k8s.io/apimachinery v0.34.0 // indirect
150+
k8s.io/apiserver v0.34.0 // indirect
151+
k8s.io/cli-runtime v0.34.0 // indirect
152+
k8s.io/client-go v0.34.0 // indirect
153+
k8s.io/component-base v0.34.0 // indirect
88154
k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9 // indirect
89155
k8s.io/helm v2.14.3+incompatible // indirect
90156
k8s.io/klog v1.0.0 // indirect
91-
k8s.io/klog/v2 v2.60.1 // indirect
92-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
157+
k8s.io/klog/v2 v2.130.1 // indirect
158+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
159+
k8s.io/kubectl v0.34.0 // indirect
160+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
161+
oras.land/oras-go/v2 v2.6.0 // indirect
93162
sigs.k8s.io/controller-tools v0.2.4 // indirect
94-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
95-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
96-
sigs.k8s.io/yaml v1.3.0 // indirect
163+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
164+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
165+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
166+
sigs.k8s.io/randfill v1.0.0 // indirect
167+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
168+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
169+
sigs.k8s.io/yaml v1.6.0 // indirect
97170
)

0 commit comments

Comments
 (0)