From 17cf20ad3f30bdd5ec823756b1ade90f8ffdcda2 Mon Sep 17 00:00:00 2001 From: git-hyagi <45576767+git-hyagi@users.noreply.github.com> Date: Mon, 23 Oct 2023 10:11:18 -0300 Subject: [PATCH] CVE-2023-44487 [noissue] --- Dockerfile | 2 +- Makefile | 2 +- bundle/manifests/pulp-operator.clusterserviceversion.yaml | 4 ++-- config/default/manager_auth_proxy_patch.yaml | 2 +- .../manifests/bases/pulp-operator.clusterserviceversion.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- main.go | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index e2f89ddd1..8c2f5419c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.20 as builder +FROM golang:1.20.10 as builder ARG TARGETOS ARG TARGETARCH diff --git a/Makefile b/Makefile index fbf6ba3ed..c73aaa1fe 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ WATCH_NAMESPACE ?= $(NAMESPACE) # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.24.2 -GOLANG_VERSION=1.20 +GOLANG_VERSION=1.20.10 GOLANG_ARCH=linux-amd64 GOLANG_INSTALL_PATH=/tmp diff --git a/bundle/manifests/pulp-operator.clusterserviceversion.yaml b/bundle/manifests/pulp-operator.clusterserviceversion.yaml index 691e78937..ebf9c60c3 100644 --- a/bundle/manifests/pulp-operator.clusterserviceversion.yaml +++ b/bundle/manifests/pulp-operator.clusterserviceversion.yaml @@ -164,7 +164,7 @@ metadata: capabilities: Full Lifecycle categories: Integration & Delivery containerImage: quay.io/pulp/pulp-operator:devel - createdAt: "2023-10-17T13:25:15Z" + createdAt: "2023-10-20T12:35:22Z" description: Pulp is a platform for managing repositories of software packages and making them available to a large number of consumers. operators.operatorframework.io/builder: operator-sdk-v1.29.0 @@ -1239,7 +1239,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.4 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index 06ba56891..a9ed9fb8c 100644 --- a/config/default/manager_auth_proxy_patch.yaml +++ b/config/default/manager_auth_proxy_patch.yaml @@ -15,7 +15,7 @@ spec: capabilities: drop: - "ALL" - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.4 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/config/manifests/bases/pulp-operator.clusterserviceversion.yaml b/config/manifests/bases/pulp-operator.clusterserviceversion.yaml index c61a9b19a..8979ea4de 100644 --- a/config/manifests/bases/pulp-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/pulp-operator.clusterserviceversion.yaml @@ -1387,7 +1387,7 @@ spec: - --upstream=http://127.0.0.1:8080/ - --logtostderr=true - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.12.0 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.4 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/go.mod b/go.mod index 1d71f7773..7e5b68e27 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( golang.org/x/text v0.13.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.26.3 - k8s.io/apimachinery v0.27.1 + k8s.io/apimachinery v0.28.0-alpha.0.0.20231013002001-194b6f8ddf62 k8s.io/cli-runtime v0.26.3 k8s.io/client-go v0.26.3 k8s.io/kubernetes v1.15.0-alpha.0 diff --git a/go.sum b/go.sum index 04e018ba3..8e6d8fd31 100644 --- a/go.sum +++ b/go.sum @@ -611,8 +611,8 @@ k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU= k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE= k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI= k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= -k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc= -k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM= +k8s.io/apimachinery v0.28.0-alpha.0.0.20231013002001-194b6f8ddf62 h1:hYhrudSr/R5J5VrfTq81MJRnd995axeLQbne/M9AAv4= +k8s.io/apimachinery v0.28.0-alpha.0.0.20231013002001-194b6f8ddf62/go.mod h1:jBGQgTjkw99ef6q5hv1YurDd3BqKDk9YRxmX0Ozo0i8= k8s.io/cli-runtime v0.26.3 h1:3ULe0oI28xmgeLMVXIstB+ZL5CTGvWSMVMLeHxitIuc= k8s.io/cli-runtime v0.26.3/go.mod h1:5YEhXLV4kLt/OSy9yQwtSSNZU2Z7aTEYta1A+Jg4VC4= k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s= diff --git a/main.go b/main.go index 990355b3f..596fd0a37 100644 --- a/main.go +++ b/main.go @@ -170,7 +170,7 @@ func main() { os.Exit(1) } - setupLog.Info("pulp-operator version: 1.0.2-beta.3") + setupLog.Info("pulp-operator version: 1.0.3-beta.3") setupLog.Info("starting manager") if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil { setupLog.Error(err, "problem running manager")