Merge pull request #183 from raghavendra-talur/rtalur-fix-2255411

Bug 2255411: Backport of upstream PRs 1171, 1173, 1174

Author: ShyamsundarR

.github/workflows/ci.yaml

@@ -23,7 +23,7 @@ env:
   IMAGE_NAME: ${{ vars.IMAGE_NAME || 'ramen' }}
   OPERATOR_SUGGESTED_NAMESPACE: ${{ vars.OPERATOR_SUGGESTED_NAMESPACE || 'ramen-system' }}
   # Constants
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.21"
   IMAGE_REGISTRY: "quay.io"
   IMAGE_TAG: "ci"
   DOCKERCMD: "podman"
@@ -39,6 +39,11 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v3
 
+      - name: Setup go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
       - name: Install prereqs
         run: |
           echo 'APT::Acquire::Retries "5";' | sudo tee /etc/apt/apt.conf.d/80-retries

Dockerfile

@@ -2,25 +2,25 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Build the manager binary
-FROM golang:1.19.1 as builder
+FROM docker.io/library/golang:1.21 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
+COPY api/ api/
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
 # Copy the go source
 COPY main.go main.go
-COPY api/ api/
 COPY controllers/ controllers/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
 
-FROM registry.access.redhat.com/ubi8/ubi
+FROM registry.access.redhat.com/ubi8/ubi-minimal
 WORKDIR /
 COPY --from=builder /workspace/manager .
 

Makefile

@@ -38,7 +38,7 @@ IMAGE_NAME ?= ramen
 IMAGE_TAG ?= latest
 PLATFORM ?= k8s
 IMAGE_TAG_BASE = $(IMAGE_REGISTRY)/$(IMAGE_REPOSITORY)/$(IMAGE_NAME)
-RBAC_PROXY_IMG ?= "gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0"
+RBAC_PROXY_IMG ?= "gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1"
 OPERATOR_SUGGESTED_NAMESPACE ?= ramen-system
 AUTO_CONFIGURE_DR_CLUSTER ?= true
 KUBE_OBJECT_PROTECTION_DISABLED ?= false
@@ -126,7 +126,7 @@ generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and
 
 .PHONY: golangci-bin
 golangci-bin:
-	hack/install-golangci-lint.sh
+	@hack/install-golangci-lint.sh
 
 .PHONY: lint
 lint: golangci-bin ## Run configured golangci-lint and pre-commit.sh linters against the code.
@@ -255,48 +255,20 @@ undeploy-dr-cluster: kustomize ## Undeploy dr-cluster controller from the K8s cl
 ##@ Tools
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
-controller_gen_version=v0.9.2
 controller-gen: ## Download controller-gen locally if necessary.
-	@test '$(shell $(CONTROLLER_GEN) --version)' = 'Version: $(controller_gen_version)' ||\
-	$(call go-get-tool,sigs.k8s.io/controller-tools/cmd/controller-gen@$(controller_gen_version))
+	@hack/install-controller-gen.sh
 
+.PHONY: kustomize
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
-	@test -f $(KUSTOMIZE) ||\
-	$(call go-get-tool,sigs.k8s.io/kustomize/kustomize/[email protected])
-
-# go-get-tool will 'go get' any package $1 and install it to bin/.
-PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
-define go-get-tool
-{ \
-set -e ;\
-TMP_DIR=$$(mktemp -d) ;\
-cd $$TMP_DIR ;\
-go mod init tmp ;\
-echo "Downloading $(1)" ;\
-GOBIN=$(PROJECT_DIR)/bin go install $(1) ;\
-rm -rf $$TMP_DIR ;\
-}
-endef
+	@hack/install-kustomize.sh
 
 ##@ Bundle
 
 .PHONY: operator-sdk
 OSDK = ./bin/operator-sdk
 operator-sdk: ## Download operator-sdk locally if necessary.
-ifeq (,$(wildcard $(OSDK)))
-ifeq (,$(shell which operator-sdk 2>/dev/null))
-	@{ \
-	set -e ;\
-	mkdir -p $(dir $(OSDK)) ;\
-	OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
-	curl -sSLo $(OSDK) https://github.com/operator-framework/operator-sdk/releases/download/v1.24.0/operator-sdk_$${OS}_$${ARCH} ;\
-	chmod +x $(OSDK) ;\
-	}
-else
-OSDK = $(shell which operator-sdk)
-endif
-endif
+	@hack/install-operator-sdk.sh
 
 .PHONY: bundle
 bundle: bundle-hub bundle-dr-cluster ## Generate all bundle manifests and metadata, then validate generated files.
@@ -355,19 +327,7 @@ bundle-dr-cluster-push: ## Push the dr-cluster bundle image.
 .PHONY: opm
 OPM = ./bin/opm
 opm: ## Download opm locally if necessary.
-ifeq (,$(wildcard $(OPM)))
-ifeq (,$(shell which opm 2>/dev/null))
-	@{ \
-	set -e ;\
-	mkdir -p $(dir $(OPM)) ;\
-	OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
-	curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.23.2/$${OS}-$${ARCH}-opm ;\
-	chmod +x $(OPM) ;\
-	}
-else
-OPM = $(shell which opm)
-endif
-endif
+	@./hack/install-opm.sh
 
 # A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v0.2.0).
 # These images MUST exist in a registry and be pull-able.

api/v1alpha1/drcluster_webhook.go

@@ -10,6 +10,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -27,50 +28,50 @@ func (r *DRCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 var _ webhook.Validator = &DRCluster{}
 
 // ValidateCreate checks
-func (r *DRCluster) ValidateCreate() error {
+func (r *DRCluster) ValidateCreate() (admission.Warnings, error) {
 	drclusterlog.Info("validate create", "name", r.Name)
 
 	return r.ValidateDRCluster()
 }
 
 // ValidateUpdate checks
-func (r *DRCluster) ValidateUpdate(old runtime.Object) error {
+func (r *DRCluster) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	drclusterlog.Info("validate update", "name", r.Name)
 
 	oldDRCluster, ok := old.(*DRCluster)
 	if !ok {
-		return fmt.Errorf("error casting old DRCluster")
+		return nil, fmt.Errorf("error casting old DRCluster")
 	}
 
 	// check for immutability for Region and S3ProfileName
 	if r.Spec.Region != oldDRCluster.Spec.Region {
-		return fmt.Errorf("Region cannot be changed")
+		return nil, fmt.Errorf("Region cannot be changed")
 	}
 
 	if r.Spec.S3ProfileName != oldDRCluster.Spec.S3ProfileName {
-		return fmt.Errorf("S3ProfileName cannot be changed")
+		return nil, fmt.Errorf("S3ProfileName cannot be changed")
 	}
 
 	return r.ValidateDRCluster()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *DRCluster) ValidateDelete() error {
+func (r *DRCluster) ValidateDelete() (admission.Warnings, error) {
 	drclusterlog.Info("validate delete", "name", r.Name)
 
-	return nil
+	return nil, nil
 }
 
-func (r *DRCluster) ValidateDRCluster() error {
+func (r *DRCluster) ValidateDRCluster() (admission.Warnings, error) {
 	if r.Spec.Region == "" {
-		return fmt.Errorf("Region cannot be empty")
+		return nil, fmt.Errorf("Region cannot be empty")
 	}
 
 	if r.Spec.S3ProfileName == "" {
-		return fmt.Errorf("S3ProfileName cannot be empty")
+		return nil, fmt.Errorf("S3ProfileName cannot be empty")
 	}
 
 	// TODO: We can add other validations like validation of CIDRs format
 
-	return nil
+	return nil, nil
 }

api/v1alpha1/drplacementcontrol_webhook.go

@@ -11,6 +11,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -28,19 +29,19 @@ func (r *DRPlacementControl) SetupWebhookWithManager(mgr ctrl.Manager) error {
 var _ webhook.Validator = &DRPlacementControl{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *DRPlacementControl) ValidateCreate() error {
+func (r *DRPlacementControl) ValidateCreate() (admission.Warnings, error) {
 	drplacementcontrollog.Info("validate create", "name", r.Name)
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *DRPlacementControl) ValidateUpdate(old runtime.Object) error {
+func (r *DRPlacementControl) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	drplacementcontrollog.Info("validate update", "name", r.Name)
 
 	oldDRPC, ok := old.(*DRPlacementControl)
 	if !ok {
-		return fmt.Errorf("error casting old DRPC")
+		return nil, fmt.Errorf("error casting old DRPC")
 	}
 
 	// checks for immutability
@@ -49,31 +50,31 @@ func (r *DRPlacementControl) ValidateUpdate(old runtime.Object) error {
 			"old", oldDRPC.Spec.PlacementRef,
 			"new", r.Spec.PlacementRef)
 
-		return fmt.Errorf("PlacementRef cannot be changed")
+		return nil, fmt.Errorf("PlacementRef cannot be changed")
 	}
 
 	if !reflect.DeepEqual(r.Spec.DRPolicyRef, oldDRPC.Spec.DRPolicyRef) {
 		drplacementcontrollog.Info("detected DRPolicyRef updates, which is disallowed", "name", r.Name,
 			"old", oldDRPC.Spec.DRPolicyRef,
 			"new", r.Spec.DRPolicyRef)
 
-		return fmt.Errorf("DRPolicyRef cannot be changed")
+		return nil, fmt.Errorf("DRPolicyRef cannot be changed")
 	}
 
 	if !reflect.DeepEqual(r.Spec.PVCSelector, oldDRPC.Spec.PVCSelector) {
 		drplacementcontrollog.Info("detected PVCSelector updates, which is disallowed", "name", r.Name,
 			"old", oldDRPC.Spec.PVCSelector,
 			"new", r.Spec.PVCSelector)
 
-		return fmt.Errorf("PVCSelector cannot be changed")
+		return nil, fmt.Errorf("PVCSelector cannot be changed")
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *DRPlacementControl) ValidateDelete() error {
+func (r *DRPlacementControl) ValidateDelete() (admission.Warnings, error) {
 	drplacementcontrollog.Info("validate delete", "name", r.Name)
 
-	return nil
+	return nil, nil
 }

api/v1alpha1/drpolicy_webhook.go

@@ -11,6 +11,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -28,45 +29,45 @@ func (r *DRPolicy) SetupWebhookWithManager(mgr ctrl.Manager) error {
 var _ webhook.Validator = &DRPolicy{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *DRPolicy) ValidateCreate() error {
+func (r *DRPolicy) ValidateCreate() (admission.Warnings, error) {
 	drpolicylog.Info("validate create", "name", r.Name)
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *DRPolicy) ValidateUpdate(old runtime.Object) error {
+func (r *DRPolicy) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	drpolicylog.Info("validate update", "name", r.Name)
 
 	oldDRPolicy, ok := old.(*DRPolicy)
 
 	if !ok {
-		return fmt.Errorf("error casting old DRPolicy")
+		return nil, fmt.Errorf("error casting old DRPolicy")
 	}
 
 	// checks for immutability
 	if r.Spec.SchedulingInterval != oldDRPolicy.Spec.SchedulingInterval {
-		return fmt.Errorf("SchedulingInterval cannot be changed")
+		return nil, fmt.Errorf("SchedulingInterval cannot be changed")
 	}
 
 	if !reflect.DeepEqual(r.Spec.ReplicationClassSelector, oldDRPolicy.Spec.ReplicationClassSelector) {
-		return fmt.Errorf("ReplicationClassSelector cannot be changed")
+		return nil, fmt.Errorf("ReplicationClassSelector cannot be changed")
 	}
 
 	if !reflect.DeepEqual(r.Spec.VolumeSnapshotClassSelector, oldDRPolicy.Spec.VolumeSnapshotClassSelector) {
-		return fmt.Errorf("VolumeSnapshotClassSelector cannot be changed")
+		return nil, fmt.Errorf("VolumeSnapshotClassSelector cannot be changed")
 	}
 
 	if !reflect.DeepEqual(r.Spec.DRClusters, oldDRPolicy.Spec.DRClusters) {
-		return fmt.Errorf("DRClusters cannot be changed")
+		return nil, fmt.Errorf("DRClusters cannot be changed")
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *DRPolicy) ValidateDelete() error {
+func (r *DRPolicy) ValidateDelete() (admission.Warnings, error) {
 	drpolicylog.Info("validate delete", "name", r.Name)
 
-	return nil
+	return nil, nil
 }

api/v1alpha1/volumereplicationgroup_types.go

@@ -258,7 +258,7 @@ type ProtectedPVC struct {
 
 	// Resources set in the claim to be replicated
 	//+optional
-	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
+	Resources corev1.VolumeResourceRequirements `json:"resources,omitempty"`
 
 	// Conditions for this protected pvc
 	//+optional