Skip to content

Commit 43fb3bb

Browse files
author
Arbel Nathan
authored
Merge develop into master 1.11.0 (#315)
1 parent 6f6f9af commit 43fb3bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+5337
-135
lines changed

‎NOTICES

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This file details additional third party software license agreements
55
and third party notices and information that are required
66
to be reproduced for the following programs:
77

8-
Operator for IBM Block Storage CSI Driver version 1.10.0
8+
Operator for IBM Block Storage CSI Driver version 1.11.0
99

1010

1111

@@ -2276,7 +2276,7 @@ End of GNU GPL Version 3.0 License
22762276

22772277
===========================================================================
22782278
END OF TERMS AND CONDITIONS FOR SEPARATELY LICENSED CODE for Operator for
2279-
IBM Block Storage CSI Driver version 1.10.0
2279+
IBM Block Storage CSI Driver version 1.11.0
22802280
===========================================================================
22812281

22822282

@@ -2287,7 +2287,7 @@ IBM Block Storage CSI Driver version 1.10.0
22872287

22882288
GNU GPL and / or LGPL Source Code for:
22892289

2290-
Operator for IBM Block Storage CSI Driver 1.10.0
2290+
Operator for IBM Block Storage CSI Driver 1.11.0
22912291

22922292
===========================================================================
22932293

@@ -2306,7 +2306,7 @@ General Public License 2.0.
23062306
Red Hat Universal Base Image 8
23072307

23082308
Source code to any of the above-listed packages distributed with
2309-
Operator for IBM Block Storage CSI Driver 1.10.0 is available at the
2309+
Operator for IBM Block Storage CSI Driver 1.11.0 is available at the
23102310
website below, when a URL is provided, or by sending a request to the
23112311
following address or email:
23122312

@@ -2335,7 +2335,7 @@ General Public License 3.0.
23352335
Red Hat Universal Base Image 8
23362336

23372337
Source code to any of the above-listed packages distributed with
2338-
Operator for IBM Block Storage CSI Driver 1.10.0 is available at the
2338+
Operator for IBM Block Storage CSI Driver 1.11.0 is available at the
23392339
website below, when a URL is provided, or by sending a request to the
23402340
following address or email:
23412341

@@ -2363,7 +2363,7 @@ under the GNU Lesser General Public License 3.0.
23632363
Prometheus version 1.8.2
23642364

23652365
Source code to any of the above-listed packages distributed with
2366-
Operator for IBM Block Storage CSI Driver 1.10.0 is available at the
2366+
Operator for IBM Block Storage CSI Driver 1.11.0 is available at the
23672367
website below, when a URL is provided, or by sending a request to the
23682368
following address or email:
23692369

@@ -5160,6 +5160,6 @@ END OF thrift NOTICES AND INFORMATION
51605160

51615161
===========================================================================
51625162
END OF NOTICES AND INFORMATION FOR Operator for IBM Block
5163-
Storage CSI Driver 1.10.0
5163+
Storage CSI Driver 1.11.0
51645164
===========================================================================
51655165

‎api/v1/hostdefinition_types.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,23 @@ type HostDefinitionSpec struct {
3030

3131
// Definition defines the observed state of HostDefinition
3232
type Definition struct {
33-
NodeName string `json:"nodeName"`
33+
NodeName string `json:"nodeName"`
34+
ManagementAddress string `json:"managementAddress"`
3435

3536
// +kubebuilder:validation:Optional
3637
SecretName string `json:"secretName"`
3738
// +kubebuilder:validation:Optional
3839
SecretNamespace string `json:"secretNamespace"`
3940
// +kubebuilder:validation:Optional
4041
NodeId string `json:"nodeId"`
42+
// +kubebuilder:validation:Optional
43+
ConnectivityType string `json:"connectivityType"`
44+
// +kubebuilder:validation:Optional
45+
Ports []string `json:"ports"`
46+
// +kubebuilder:validation:Optional
47+
NodeNameOnStorage string `json:"nodeNameOnStorage"`
48+
// +kubebuilder:validation:Optional
49+
IOGroups []int `json:"ioGroups"`
4150
}
4251

4352
// HostDefinitionStatus defines the status of the host definition on the storage
@@ -53,6 +62,7 @@ type HostDefinitionStatus struct {
5362
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
5463
// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`
5564
// +kubebuilder:printcolumn:name="Node",type=string,JSONPath=`.spec.hostDefinition.nodeName`
65+
// +kubebuilder:printcolumn:name="Management_Address",type=string,JSONPath=`.spec.hostDefinition.managementAddress`
5666
type HostDefinition struct {
5767
metav1.TypeMeta `json:",inline"`
5868
metav1.ObjectMeta `json:"metadata,omitempty"`

‎api/v1/zz_generated.deepcopy.go

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/Dockerfile.operator

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ RUN CGO_ENABLED=1 GOOS=linux go build \
2424
main.go
2525

2626

27-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6-854
27+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049
2828
MAINTAINER IBM Storage
2929

30-
ARG VERSION=1.10.0
30+
ARG VERSION=1.11.0
3131
ARG BUILD_NUMBER=0
3232

3333
###Required Labels

‎build/ci/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pipeline {
22
parameters {
3-
string(name: 'IMAGE_VERSION', defaultValue: "1.10.0")
3+
string(name: 'IMAGE_VERSION', defaultValue: "1.11.0")
44
string(name: 'DOCKER_REGISTRY', defaultValue: DEFAULT_DOCKER_REGISTRY)
55
string(name: 'EMAIL_TO', defaultValue: "")
66
}

‎build/ci/multiarch/helper_to_push_csi_images_and_manifests.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,15 @@ function push_arch_images_and_create_manifest_for_app() {
4949
operator_envs="in_OPERATOR_IMAGE_AMD64 out_OPERATOR_IMAGE_AMD64 in_OPERATOR_IMAGE_PPC64LE out_OPERATOR_IMAGE_PPC64LE in_OPERATOR_IMAGE_S390X out_OPERATOR_IMAGE_S390X out_OPERATOR_IMAGE_MULTIARCH"
5050
controller_envs="in_CONTROLLER_IMAGE_AMD64 out_CONTROLLER_IMAGE_AMD64 in_CONTROLLER_IMAGE_PPC64LE out_CONTROLLER_IMAGE_PPC64LE in_CONTROLLER_IMAGE_S390X out_CONTROLLER_IMAGE_S390X out_CONTROLLER_IMAGE_MULTIARCH"
5151
node_envs="in_NODE_IMAGE_AMD64 out_NODE_IMAGE_AMD64 in_NODE_IMAGE_PPC64LE out_NODE_IMAGE_PPC64LE in_NODE_IMAGE_S390X out_NODE_IMAGE_S390X out_NODE_IMAGE_MULTIARCH"
52+
hostdefiner_envs="in_HOST_DEFINER_IMAGE_AMD64 out_HOST_DEFINER_IMAGE_AMD64 in_HOST_DEFINER_IMAGE_PPC64LE out_HOST_DEFINER_IMAGE_PPC64LE in_HOST_DEFINER_IMAGE_S390X out_HOST_DEFINER_IMAGE_S390X out_HOST_DEFINER_IMAGE_MULTIARCH"
5253

5354
HELPER_PUSH_IMAGE=./helper_to_push_docker_image.sh
5455
HELPER_PUSH_MANIFEST=./helper_to_push_docker_manifest.sh
5556

5657
date
5758
# Validations
5859
[ -f $HELPER_PUSH_IMAGE -a -f $HELPER_PUSH_MANIFEST ] && : || exit 1
59-
for expected_env in $operator_envs $controller_envs $node_envs; do
60+
for expected_env in $operator_envs $controller_envs $node_envs $hostdefiner_envs; do
6061
[ -z "$(printenv $expected_env)" ] && {
6162
echo "Error: expected env [$expected_env] does not exist. Please set it first."
6263
exit 1
@@ -69,6 +70,7 @@ echo "TAG_LATEST=$TAG_LATEST"
6970
push_arch_images_and_create_manifest_for_app "operator" $in_OPERATOR_IMAGE_AMD64 $out_OPERATOR_IMAGE_AMD64 $in_OPERATOR_IMAGE_PPC64LE $out_OPERATOR_IMAGE_PPC64LE $in_OPERATOR_IMAGE_S390X $out_OPERATOR_IMAGE_S390X $out_OPERATOR_IMAGE_MULTIARCH $TAG_LATEST
7071
push_arch_images_and_create_manifest_for_app "controller" $in_CONTROLLER_IMAGE_AMD64 $out_CONTROLLER_IMAGE_AMD64 $in_CONTROLLER_IMAGE_PPC64LE $out_CONTROLLER_IMAGE_PPC64LE $in_CONTROLLER_IMAGE_S390X $out_CONTROLLER_IMAGE_S390X $out_CONTROLLER_IMAGE_MULTIARCH $TAG_LATEST
7172
push_arch_images_and_create_manifest_for_app "node" $in_NODE_IMAGE_AMD64 $out_NODE_IMAGE_AMD64 $in_NODE_IMAGE_PPC64LE $out_NODE_IMAGE_PPC64LE $in_NODE_IMAGE_S390X $out_NODE_IMAGE_S390X $out_NODE_IMAGE_MULTIARCH $TAG_LATEST
73+
push_arch_images_and_create_manifest_for_app "hostdefiner" $in_HOST_DEFINER_IMAGE_AMD64 $out_HOST_DEFINER_IMAGE_AMD64 $in_HOST_DEFINER_IMAGE_PPC64LE $out_HOST_DEFINER_IMAGE_PPC64LE $in_HOST_DEFINER_IMAGE_S390X $out_HOST_DEFINER_IMAGE_S390X $out_HOST_DEFINER_IMAGE_MULTIARCH $TAG_LATEST
7274

7375
date
7476
echo "######################################"
@@ -78,3 +80,4 @@ echo "######################################"
7880
echo $out_OPERATOR_IMAGE_MULTIARCH
7981
echo $out_CONTROLLER_IMAGE_MULTIARCH
8082
echo $out_NODE_IMAGE_MULTIARCH
83+
echo $out_HOST_DEFINER_IMAGE_MULTIARCH

‎config/crd/bases/csi.ibm.com_hostdefiners.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
app.kubernetes.io/name: ibm-block-csi-operator
1111
csi: ibm
1212
product: ibm-block-csi-driver
13-
release: v1.10.0
13+
release: v1.11.0
1414
name: hostdefiners.csi.ibm.com
1515
spec:
1616
group: csi.ibm.com

‎config/crd/bases/csi.ibm.com_hostdefinitions.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
app.kubernetes.io/name: ibm-block-csi-operator
1111
csi: ibm
1212
product: ibm-block-csi-driver
13-
release: v1.10.0
13+
release: v1.11.0
1414
name: hostdefinitions.csi.ibm.com
1515
spec:
1616
group: csi.ibm.com
@@ -31,6 +31,9 @@ spec:
3131
- jsonPath: .spec.hostDefinition.nodeName
3232
name: Node
3333
type: string
34+
- jsonPath: .spec.hostDefinition.managementAddress
35+
name: Management_Address
36+
type: string
3437
name: v1
3538
schema:
3639
openAPIV3Schema:
@@ -50,15 +53,30 @@ spec:
5053
hostDefinition:
5154
description: Definition defines the observed state of HostDefinition
5255
properties:
56+
connectivityType:
57+
type: string
58+
ioGroups:
59+
items:
60+
type: integer
61+
type: array
62+
managementAddress:
63+
type: string
5364
nodeId:
5465
type: string
5566
nodeName:
5667
type: string
68+
nodeNameOnStorage:
69+
type: string
70+
ports:
71+
items:
72+
type: string
73+
type: array
5774
secretName:
5875
type: string
5976
secretNamespace:
6077
type: string
6178
required:
79+
- managementAddress
6280
- nodeName
6381
type: object
6482
required:

‎config/crd/bases/csi.ibm.com_ibmblockcsis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
app.kubernetes.io/name: ibm-block-csi-operator
1111
csi: ibm
1212
product: ibm-block-csi-driver
13-
release: v1.10.0
13+
release: v1.11.0
1414
name: ibmblockcsis.csi.ibm.com
1515
spec:
1616
group: csi.ibm.com

‎config/crd/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ commonLabels:
44
app.kubernetes.io/name: ibm-block-csi-operator
55
app.kubernetes.io/instance: ibm-block-csi-operator
66
app.kubernetes.io/managed-by: ibm-block-csi-operator
7-
release: v1.10.0
7+
release: v1.11.0
88

99
resources:
1010
- bases/csi.ibm.com_ibmblockcsis.yaml

‎config/manager/manager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
productID: 5027566ef6c54de49028be7df25119e1
2121
productMetric: FREE
2222
productName: IBM Block CSI Driver
23-
productVersion: 1.10.0
23+
productVersion: 1.11.0
2424
labels:
2525
app.kubernetes.io/instance: ibm-block-csi-operator
2626
app.kubernetes.io/managed-by: ibm-block-csi-operator
@@ -54,7 +54,7 @@ spec:
5454
fieldPath: metadata.name
5555
- name: OPERATOR_NAME
5656
value: ibm-block-csi-operator
57-
image: ibmcom/ibm-block-csi-operator:1.10.0
57+
image: quay.io/ibmcsiblock/ibm-block-csi-operator:1.11.0
5858
imagePullPolicy: IfNotPresent
5959
livenessProbe:
6060
exec:

‎config/rbac/role.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,21 @@ rules:
4545
- list
4646
- update
4747
- watch
48+
- patch
4849
- apiGroups:
4950
- ""
5051
resources:
5152
- persistentvolumeclaims/status
5253
verbs:
54+
- get
55+
- update
5356
- patch
57+
- apiGroups:
58+
- ""
59+
resources:
60+
- persistentvolumeclaims/finalizers
61+
verbs:
62+
- update
5463
- apiGroups:
5564
- ""
5665
resources:

‎config/rbac/service_account.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ metadata:
77
app.kubernetes.io/name: ibm-block-csi-operator
88
csi: ibm
99
product: ibm-block-csi-driver
10-
release: v1.10.0
10+
release: v1.11.0
1111
name: ibm-block-csi-operator
1212
namespace: default

‎config/samples/csi.ibm.com_v1_ibmblockcsi_cr.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ metadata:
77
app.kubernetes.io/name: ibm-block-csi
88
app.kubernetes.io/instance: ibm-block-csi
99
app.kubernetes.io/managed-by: ibm-block-csi-operator
10-
release: v1.10.0
10+
release: v1.11.0
1111
spec:
1212
# controller is a statefulSet with ibm-block-csi-controller container
1313
# and csi-provisioner, csi-attacher, csi-snapshotter and livenessprobe sidecars.
1414
controller:
15-
repository: ibmcom/ibm-block-csi-driver-controller
16-
tag: "1.10.0"
15+
repository: quay.io/ibmcsiblock/ibm-block-csi-driver-controller
16+
tag: "1.11.0"
1717
imagePullPolicy: IfNotPresent
1818
affinity:
1919
nodeAffinity:
@@ -30,8 +30,8 @@ spec:
3030
# node is a daemonSet with ibm-block-csi-node container
3131
# and csi-node-driver-registrar and livenessprobe sidecars.
3232
node:
33-
repository: ibmcom/ibm-block-csi-driver-node
34-
tag: "1.10.0"
33+
repository: quay.io/ibmcsiblock/ibm-block-csi-driver-node
34+
tag: "1.11.0"
3535
imagePullPolicy: IfNotPresent
3636
affinity:
3737
nodeAffinity:
@@ -72,8 +72,12 @@ spec:
7272
tag: "v1.4.0"
7373
imagePullPolicy: IfNotPresent
7474
- name: csi-addons-replicator
75-
repository: quay.io/csiaddons/volumereplication-operator
76-
tag: "v0.2.0"
75+
repository: quay.io/ibmcsiblock/csi-block-volumereplication-operator
76+
tag: "v0.9.0"
77+
imagePullPolicy: IfNotPresent
78+
- name: csi-volume-group
79+
repository: quay.io/ibmcsiblock/csi-volume-group-operator
80+
tag: "v0.9.0"
7781
imagePullPolicy: IfNotPresent
7882
- name: livenessprobe
7983
repository: k8s.gcr.io/sig-storage/livenessprobe

‎config/samples/csi_v1_hostdefiner_cr.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ metadata:
77
app.kubernetes.io/name: host-definer
88
app.kubernetes.io/instance: ibm-block-csi
99
app.kubernetes.io/managed-by: ibm-block-csi-operator
10-
release: v1.10.0
10+
release: v1.11.0
1111
spec:
1212
hostDefiner:
13-
# prefix:
14-
# connectivityType:
15-
# allowDelete: true # Optional. Values true/false. The default is true.
16-
# dynamicNodeLabeling: false # Optional. Values true/false. The default is false.
17-
repository: ibmcom/ibm-block-csi-host-definer
18-
tag: "1.10.0"
13+
# prefix: # Optional.
14+
# connectivityType: # Optional. Values nvme/fc/iscsi. The default is chosen dynamically.
15+
# allowDelete: true # Optional. Values true/false. The default is true.
16+
# dynamicNodeLabeling: false # Optional. Values true/false. The default is false.
17+
repository: quay.io/ibmcsiblock/ibm-block-csi-host-definer
18+
tag: "1.11.0"
1919
imagePullPolicy: IfNotPresent
2020
affinity:
2121
nodeAffinity:

0 commit comments

Comments
 (0)