Skip to content
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

OCPBUGS-7683 OCPBUGS-5172: Bump helm to v3.11.1 to address CVE-2023-25165 #19

Merged
merged 32 commits into from
Mar 2, 2023
Merged

OCPBUGS-7683 OCPBUGS-5172: Bump helm to v3.11.1 to address CVE-2023-25165 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
71e9b06
chore: bump cert-mgr version
Sep 14, 2022
dea1068
bump to k8s 1.25, kind 0.15, go 1.19, golangci-lint 1.49, goreleaser …
joelanford Sep 14, 2022
a4edc1e
docs directory rearrange
akihikokuroda Sep 2, 2022
43b3462
fix: update docs directory to be more condensed and update informatio…
Sep 16, 2022
84eddd8
fix: avoid bundle update errors during deletion
joelanford Sep 12, 2022
7777459
define constants for common defaults
joelanford Sep 16, 2022
e23b858
fix: align bundle deployment update mechanism with bundles
joelanford Sep 12, 2022
09d6065
docs: combine both helm provisioner documents
Sep 26, 2022
fecf714
docs: remove redundant provisioner documentation and fix linkage
Sep 26, 2022
c8e4f80
test(e2e): add ability to configure the image registry for test images
Sep 26, 2022
5fbbfa0
add provisioner in the print column
akihikokuroda Sep 30, 2022
82cdea5
docs: update README.md links to reference the correct locations
Oct 4, 2022
b2031d3
Consolidate bundle and BD controller code
joelanford Sep 22, 2022
842bd93
add resources/requests
akihikokuroda Sep 29, 2022
1f57011
add resources to watch list
akihikokuroda Aug 22, 2022
4d51979
local git repository for e2e test
akihikokuroda Oct 6, 2022
7720bdd
relocate test tools
akihikokuroda Oct 12, 2022
d13df3c
internal/convert: Fix 'webhookDefiniions' typo in error message
timflannagan Oct 24, 2022
dab699b
internal,test: Ensure status condition message is capitalized
timflannagan Oct 25, 2022
a91b574
Update README.md
timflannagan Oct 28, 2022
6221380
set bundle deployment controller name correctly
joelanford Nov 4, 2022
abcadb1
style: introduce gosec linter
Kavinjsir Nov 19, 2022
5b6a1f8
fix: fill message in bundle status
Kavinjsir Nov 23, 2022
c67b36b
fix: bump golang/x/net to v0.4.0 for CVE-2022-41717
anik120 Jan 24, 2023
65d1423
Fix e2e: Force localhost for some containers
tmshort Feb 21, 2023
f5153d1
Bump helm to v3.11.1 to address CVE-2023-25165
tmshort Feb 20, 2023
3fffb28
squash! Bump helm to v3.11.1 to address CVE-2023-25165
tmshort Feb 22, 2023
740cf45
Merge fixup: update to internal/provisioner/plain
tmshort Feb 23, 2023
19f21d0
Merge fixup: update with go mod tidy/vendor
tmshort Feb 23, 2023
e5a69cd
Merge fixup: update containers to 4.13
tmshort Feb 23, 2023
a228eab
Merge fixup: Disable an e2e test
tmshort Feb 28, 2023
efe2744
Merge fixup: update from operator-framework/rukpak
tmshort Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.19-openshift-4.12
tag: rhel-8-release-golang-1.19-openshift-4.13
4 changes: 1 addition & 3 deletions .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ linters:
enable:
- asciicheck
- bodyclose
- deadcode
- depguard
- errorlint
- gofmt
- goimports
- gosec
- importas
- misspell
- nestif
Expand All @@ -22,7 +22,6 @@ linters:
- unconvert
- unparam
- unused
- varcheck
- whitespace

linters-settings:
Expand All @@ -42,6 +41,5 @@ linters-settings:
goimports:
local-prefixes: github.com/operator-framework/rukpak


output:
format: tab
6 changes: 6 additions & 0 deletions .goreleaser.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ builds:
- id: unpack
main: ./cmd/unpack
binary: unpack
tags: $GO_BUILD_TAGS
goos:
- linux
goarch:
Expand All @@ -23,6 +24,7 @@ builds:
- id: helm
main: ./cmd/helm
binary: helm
tags: $GO_BUILD_TAGS
goos:
- linux
goarch:
Expand All @@ -35,6 +37,7 @@ builds:
- id: core
main: ./cmd/core
binary: core
tags: $GO_BUILD_TAGS
goos:
- linux
goarch:
Expand All @@ -47,6 +50,7 @@ builds:
- id: webhooks
main: ./cmd/webhooks
binary: webhooks
tags: $GO_BUILD_TAGS
goos:
- linux
goarch:
Expand All @@ -59,6 +63,7 @@ builds:
- id: crdvalidator
main: ./cmd/crdvalidator
binary: crdvalidator
tags: $GO_BUILD_TAGS
goos:
- linux
goarch:
Expand All @@ -71,6 +76,7 @@ builds:
- id: rukpakctl
main: ./cmd/rukpakctl
binary: rukpakctl
tags: $GO_BUILD_TAGS
goos:
- linux
goarch:
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 AS builder

# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
COPY .git/HEAD .git/HEAD
Expand All @@ -9,11 +9,14 @@ WORKDIR /build
COPY . .
RUN make build

FROM registry.ci.openshift.org/ocp/4.12:base
FROM registry.ci.openshift.org/ocp/4.13:base

COPY --from=builder /build/bin/core /
COPY --from=builder /build/bin/unpack /
COPY --from=builder /build/bin/webhooks /
COPY --from=builder /build/bin/helm /
COPY --from=builder /build/bin/crdvalidator /
COPY --from=builder /build/bin/rukpakctl /
USER 1001

LABEL io.k8s.display-name="OpenShift RukPak" \
Expand Down
Loading