diff --git a/Dockerfile b/Dockerfile index dbb831a..1659e64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.23.5 AS builder +FROM golang:1.23.6 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/api/v1alpha1/common_types.go b/api/v1alpha1/common_types.go index 46ce5ab..c45b747 100644 --- a/api/v1alpha1/common_types.go +++ b/api/v1alpha1/common_types.go @@ -77,7 +77,7 @@ type NetworkPolicy struct { } type HAProxy struct { Enabled bool `json:"enabled,omitempty"` - // +kubebuilder:default:="haproxytech/haproxy-alpine:3.1" + // +kubebuilder:default:="haproxytech/haproxy-alpine:3.2" Image string `json:"image,omitempty"` ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"` // +kubebuilder:default:=1 @@ -86,9 +86,8 @@ type HAProxy struct { FrontendPort int32 `json:"frontendPort,omitempty"` AppServers []AppServers `json:"appServers,omitempty"` // +kubebuilder:default:=false - PathBasedRouting *bool `json:"pathBasedRouting,omitempty"` - RestartWhenUpgrade *bool `json:"restartWhenUpgrade,omitempty"` - Service *corev1.ServiceType `json:"service,omitempty"` + PathBasedRouting *bool `json:"pathBasedRouting,omitempty"` + Service *corev1.ServiceType `json:"service,omitempty"` // +kubebuilder:default:={enabled: false} TcpPorts Tcpports `json:"tcpPorts,omitempty"` // +kubebuilder:default:={client: 600, connect: 600, server: 600} diff --git a/config/crd/bases/database.marklogic.com_marklogicclusters.yaml b/config/crd/bases/database.marklogic.com_marklogicclusters.yaml index ab874dc..0a5e97b 100644 --- a/config/crd/bases/database.marklogic.com_marklogicclusters.yaml +++ b/config/crd/bases/database.marklogic.com_marklogicclusters.yaml @@ -3771,7 +3771,7 @@ spec: format: int32 type: integer image: - default: haproxytech/haproxy-alpine:3.1 + default: haproxytech/haproxy-alpine:3.2 type: string imagePullSecrets: items: @@ -4055,8 +4055,6 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object - restartWhenUpgrade: - type: boolean service: description: Service Type string describes ingress methods for a service @@ -8049,7 +8047,7 @@ spec: format: int32 type: integer image: - default: haproxytech/haproxy-alpine:3.1 + default: haproxytech/haproxy-alpine:3.2 type: string imagePullSecrets: items: @@ -8337,8 +8335,6 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object - restartWhenUpgrade: - type: boolean service: description: Service Type string describes ingress methods for a service diff --git a/go.mod b/go.mod index 309a0de..9776079 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/marklogic/marklogic-kubernetes-operator -go 1.23.5 +go 1.23.6 require ( github.com/cisco-open/k8s-objectmatcher v1.10.0