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.

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

Update ODF version for CVE fixes #292

Merged
merged 5 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.46.2
version: v1.49.0
args: --timeout 3m --verbose
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.17 as builder
FROM golang:1.19 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# ===== Overridable Variables ===== #

# Current Operator version
VERSION ?= 2.1.1
REPLACES ?= 2.1.0
VERSION ?= 2.1.2
REPLACES ?= 2.1.1

# Default bundle image tag
IMAGE_TAG_BASE ?= controller
Expand Down
2 changes: 1 addition & 1 deletion config/metadata/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ dependencies:
- type: olm.package
value:
packageName: odf-operator
version: "4.10.9 || 4.11.10"
version: "4.11.12"
4 changes: 2 additions & 2 deletions controllers/managedocs_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package controllers
import (
"context"
"fmt"
"io/ioutil"
"math"
"net/url"
"os"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -1331,7 +1331,7 @@ func (r *ManagedOCSReconciler) reconcileAlertmanagerConfig() error {
if smtpPassword == "" {
return fmt.Errorf("smtp secret does not contain a password entry")
}
smtpHTML, err := ioutil.ReadFile(r.CustomerNotificationHTMLPath)
smtpHTML, err := os.ReadFile(r.CustomerNotificationHTMLPath)
if err != nil {
return fmt.Errorf("unable to read customernotification.html file: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/red-hat-storage/ocs-osd-deployer

go 1.17
go 1.19

require (
github.com/go-logr/logr v1.2.3
Expand Down
91 changes: 0 additions & 91 deletions go.sum

Large diffs are not rendered by default.