Merge branch 'develop' into add_csi_addons

Signed-off-by: matancarmeli7 <[email protected]>

Author: matancarmeli7

.github/dependabot.yml

@@ -0,0 +1,28 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    rebase-strategy: "disabled"
+    reviewers:
+      - "IBM/csi-reviewers"
+    labels:
+      - go
+      - dependencies
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    rebase-strategy: "disabled"
+    reviewers:
+      - "IBM/csi-reviewers"
+    labels:
+      - github_actions
+      - dependencies
+

Makefile

@@ -39,13 +39,18 @@ manifests: controller-gen kustomize## Generate WebhookConfiguration, ClusterRole
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
+CONTROLLER_TOOLS_VERSION ?= v0.10.0
+
 CONTROLLER_GEN = controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
+	test -s controller-gen || go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
+
+KUSTOMIZE_VERSION ?= v5.0.1
+KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 
 KUSTOMIZE = kustomize
 kustomize: ## Download kustomize locally if necessary.
-	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
+	test -s /go/bin/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) /go/bin/; }
 
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 define go-get-tool

api/v1/ibmblockcsi_types.go

@@ -50,6 +50,10 @@ type IBMBlockCSISpec struct {
 	ImagePullSecrets []string `json:"imagePullSecrets,omitempty"`
 
 	HealthPort uint16 `json:"healthPort,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default:=true
+	EnableCallHome bool `json:"enableCallHome,omitempty"`
 }
 
 // seems not work in this way, need to figure out why

api/v1/zz_generated.deepcopy.go

@@ -12,19 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16.14
+FROM golang:1.19
 
 WORKDIR /go/src/github.com/IBM/ibm-block-csi-operator/
 COPY . .
+RUN go mod download
 RUN CGO_ENABLED=1 GOOS=linux go build \
     -o build/_output/bin/ibm-block-csi-operator \
     -gcflags all=-trimpath=${GOPATH} \
 	-asmflags all=-trimpath=${GOPATH} \
-	-mod=vendor \
 	main.go
 
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
 MAINTAINER IBM Storage
 
 ARG VERSION=1.12.0

build/Dockerfile.operator

@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16.14
+FROM golang:1.19
 
 ENV GO111MODULE=on \
     GOROOT=/usr/local/go \
     WORKDIR=/go/src/github.com/IBM/ibm-block-csi-operator
 ENV IBMBlockCSI_CR_YAML=$WORKDIR/config/samples/csi.ibm.com_v1_ibmblockcsi_cr.yaml \
     HostDefiner_CR_YAML=$WORKDIR/config/samples/csi_v1_hostdefiner_cr.yaml
 WORKDIR $WORKDIR
-RUN go get github.com/onsi/ginkgo/ginkgo@v1.16.4 \
+RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.0 \
     && go install sigs.k8s.io/controller-runtime/tools/[email protected]
 COPY Makefile .
 

build/ci/Dockerfile.unittest

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.10.0
   creationTimestamp: null
   labels:
     app.kubernetes.io/instance: ibm-block-csi-operator
@@ -40,10 +40,14 @@ spec:
         description: HostDefinition is the Schema for the hostdefinitions API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object
@@ -83,7 +87,8 @@ spec:
             - hostDefinition
             type: object
           status:
-            description: HostDefinitionStatus defines the status of the host definition on the storage
+            description: HostDefinitionStatus defines the status of the host definition
+              on the storage
             properties:
               phase:
                 type: string
@@ -95,9 +100,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []