Skip to content

Commit d79fea2

Browse files
pengzhoumlPeng Zhou
and
Peng Zhou
authored
MLE-19593 upgrade version of golang and haproxy image to fix security vulnerabilities (#59)
* update go version to 1.23.6 to get rid of security vulnerability * update haproxy image version to haproxytech/haproxy-alpine:3.1.3 to fix security vulnerability * upgrade haproxy image to 3.2 --------- Co-authored-by: Peng Zhou <[email protected]>
1 parent df2958c commit d79fea2

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23.5 AS builder
2+
FROM golang:1.23.6 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

api/v1alpha1/common_types.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ type NetworkPolicy struct {
7777
}
7878
type HAProxy struct {
7979
Enabled bool `json:"enabled,omitempty"`
80-
// +kubebuilder:default:="haproxytech/haproxy-alpine:3.1"
80+
// +kubebuilder:default:="haproxytech/haproxy-alpine:3.2"
8181
Image string `json:"image,omitempty"`
8282
ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
8383
// +kubebuilder:default:=1
@@ -86,9 +86,8 @@ type HAProxy struct {
8686
FrontendPort int32 `json:"frontendPort,omitempty"`
8787
AppServers []AppServers `json:"appServers,omitempty"`
8888
// +kubebuilder:default:=false
89-
PathBasedRouting *bool `json:"pathBasedRouting,omitempty"`
90-
RestartWhenUpgrade *bool `json:"restartWhenUpgrade,omitempty"`
91-
Service *corev1.ServiceType `json:"service,omitempty"`
89+
PathBasedRouting *bool `json:"pathBasedRouting,omitempty"`
90+
Service *corev1.ServiceType `json:"service,omitempty"`
9291
// +kubebuilder:default:={enabled: false}
9392
TcpPorts Tcpports `json:"tcpPorts,omitempty"`
9493
// +kubebuilder:default:={client: 600, connect: 600, server: 600}

config/crd/bases/database.marklogic.com_marklogicclusters.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -3771,7 +3771,7 @@ spec:
37713771
format: int32
37723772
type: integer
37733773
image:
3774-
default: haproxytech/haproxy-alpine:3.1
3774+
default: haproxytech/haproxy-alpine:3.2
37753775
type: string
37763776
imagePullSecrets:
37773777
items:
@@ -4055,8 +4055,6 @@ spec:
40554055
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
40564056
type: object
40574057
type: object
4058-
restartWhenUpgrade:
4059-
type: boolean
40604058
service:
40614059
description: Service Type string describes ingress methods for
40624060
a service
@@ -8049,7 +8047,7 @@ spec:
80498047
format: int32
80508048
type: integer
80518049
image:
8052-
default: haproxytech/haproxy-alpine:3.1
8050+
default: haproxytech/haproxy-alpine:3.2
80538051
type: string
80548052
imagePullSecrets:
80558053
items:
@@ -8337,8 +8335,6 @@ spec:
83378335
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
83388336
type: object
83398337
type: object
8340-
restartWhenUpgrade:
8341-
type: boolean
83428338
service:
83438339
description: Service Type string describes ingress methods
83448340
for a service

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/marklogic/marklogic-kubernetes-operator
22

3-
go 1.23.5
3+
go 1.23.6
44

55
require (
66
github.com/cisco-open/k8s-objectmatcher v1.10.0

0 commit comments

Comments
 (0)