Merge branch 'master' into feature/KO-427-local-pvc-cleanup

Author: abhishekdwivedi3060

.github/workflows/golangci-lint.yaml

@@ -25,5 +25,5 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.60.1
+          version: v1.60.2
           args: --timeout=5m

.golangci.yml

@@ -35,7 +35,7 @@ linters:
     - dogsled
     - dupl
     - errcheck
-    - exportloopref
+    - copyloopvar
     - exhaustive
     - goconst
     - gocritic

Jenkinsfile

@@ -24,7 +24,7 @@ pipeline {
 
         AEROSPIKE_CUSTOM_INIT_REGISTRY="568976754000.dkr.ecr.ap-south-1.amazonaws.com"
         AEROSPIKE_CUSTOM_INIT_REGISTRY_NAMESPACE="aerospike"
-        AEROSPIKE_CUSTOM_INIT_NAME_TAG="aerospike-kubernetes-init:2.3.0-dev2"
+        AEROSPIKE_CUSTOM_INIT_NAME_TAG="aerospike-kubernetes-init:2.3.0-dev3"
     }
 
     stages {

Makefile

@@ -243,7 +243,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
 KUSTOMIZE_VERSION ?= v5.4.3
 CONTROLLER_TOOLS_VERSION ?= v0.16.1
 ENVTEST_VERSION ?= release-0.19
-GOLANGCI_LINT_VERSION ?= v1.60.1
+GOLANGCI_LINT_VERSION ?= v1.60.2
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
 OPERATOR_SDK_VERSION ?= v1.39.1

api/v1/utils.go

@@ -70,7 +70,7 @@ const (
 	AerospikeInitContainerNameTagEnvVar            = "AEROSPIKE_KUBERNETES_INIT_NAME_TAG"
 	AerospikeInitContainerDefaultRegistry          = "docker.io"
 	AerospikeInitContainerDefaultRegistryNamespace = "aerospike"
-	AerospikeInitContainerDefaultNameAndTag        = "aerospike-kubernetes-init:2.3.0-dev2"
+	AerospikeInitContainerDefaultNameAndTag        = "aerospike-kubernetes-init:2.3.0-dev3"
 	AerospikeAppLabel                              = "app"
 	AerospikeAppLabelValue                         = "aerospike-cluster"
 	AerospikeCustomResourceLabel                   = "aerospike.com/cr"
@@ -402,28 +402,28 @@ func GetDigestLogFile(aerospikeConfigSpec AerospikeConfigSpec) (
 	return nil, fmt.Errorf("xdr not configured")
 }
 
-func GetServiceTLSNameAndPort(aeroConf *AerospikeConfigSpec) (tlsName string, port *int) {
+func GetServiceTLSNameAndPort(aeroConf *AerospikeConfigSpec) (tlsName string, port *int32) {
 	return GetTLSNameAndPort(aeroConf, confKeyService)
 }
 
-func GetHeartbeatTLSNameAndPort(aeroConf *AerospikeConfigSpec) (tlsName string, port *int) {
+func GetHeartbeatTLSNameAndPort(aeroConf *AerospikeConfigSpec) (tlsName string, port *int32) {
 	return GetTLSNameAndPort(aeroConf, confKeyNetworkHeartbeat)
 }
 
-func GetFabricTLSNameAndPort(aeroConf *AerospikeConfigSpec) (tlsName string, port *int) {
+func GetFabricTLSNameAndPort(aeroConf *AerospikeConfigSpec) (tlsName string, port *int32) {
 	return GetTLSNameAndPort(aeroConf, confKeyNetworkFabric)
 }
 
 func GetTLSNameAndPort(
 	aeroConf *AerospikeConfigSpec, connectionType string,
-) (tlsName string, port *int) {
+) (tlsName string, port *int32) {
 	if networkConfTmp, ok := aeroConf.Value[ConfKeyNetwork]; ok {
 		networkConf := networkConfTmp.(map[string]interface{})
 		serviceConf := networkConf[connectionType].(map[string]interface{})
 
 		if tlsName, ok := serviceConf["tls-name"]; ok {
 			if tlsPort, portConfigured := serviceConf["tls-port"]; portConfigured {
-				intPort := int(tlsPort.(float64))
+				intPort := int32(tlsPort.(float64))
 				return tlsName.(string), &intPort
 			}
 
@@ -434,25 +434,25 @@ func GetTLSNameAndPort(
 	return "", nil
 }
 
-func GetServicePort(aeroConf *AerospikeConfigSpec) *int {
+func GetServicePort(aeroConf *AerospikeConfigSpec) *int32 {
 	return GetPortFromConfig(aeroConf, ConfKeyNetworkService, "port")
 }
 
-func GetHeartbeatPort(aeroConf *AerospikeConfigSpec) *int {
+func GetHeartbeatPort(aeroConf *AerospikeConfigSpec) *int32 {
 	return GetPortFromConfig(aeroConf, confKeyNetworkHeartbeat, "port")
 }
 
-func GetFabricPort(aeroConf *AerospikeConfigSpec) *int {
+func GetFabricPort(aeroConf *AerospikeConfigSpec) *int32 {
 	return GetPortFromConfig(aeroConf, confKeyNetworkFabric, "port")
 }
 
 func GetPortFromConfig(
 	aeroConf *AerospikeConfigSpec, connectionType string, paramName string,
-) *int {
+) *int32 {
 	if networkConf, ok := aeroConf.Value[ConfKeyNetwork]; ok {
 		if connectionConfig, ok := networkConf.(map[string]interface{})[connectionType]; ok {
 			if port, ok := connectionConfig.(map[string]interface{})[paramName]; ok {
-				intPort := int(port.(float64))
+				intPort := int32(port.(float64))
 				return &intPort
 			}
 		}
@@ -549,13 +549,13 @@ func GetDefaultPasswordFilePath(aerospikeConfigSpec *AerospikeConfigSpec) *strin
 	return &passFile
 }
 
-func DistributeItems(totalItems, totalGroups int) []int {
+func DistributeItems(totalItems, totalGroups int32) []int32 {
 	itemsPerGroup, extraItems := totalItems/totalGroups, totalItems%totalGroups
 
 	// Distributing nodes in given racks
-	var topology []int
+	var topology []int32
 
-	for groupIdx := 0; groupIdx < totalGroups; groupIdx++ {
+	for groupIdx := int32(0); groupIdx < totalGroups; groupIdx++ {
 		itemsForThisGroup := itemsPerGroup
 		if groupIdx < extraItems {
 			itemsForThisGroup++

config/manager/manager.yaml

@@ -68,7 +68,7 @@ spec:
           value: aerospike
         - name: AEROSPIKE_KUBERNETES_INIT_NAME_TAG
           # this is the name and tag of aerospike-init image
-          value: aerospike-kubernetes-init:2.3.0-dev2
+          value: aerospike-kubernetes-init:2.3.0-dev3
       volumes: []
       serviceAccountName: controller-manager
 

config/samples/aerospikebackupservice.yaml

@@ -4,7 +4,7 @@ metadata:
   name: aerospikebackupservice-sample
   namespace: aerospike
 spec:
-  image: aerospike/aerospike-backup-service:3.0.1
+  image: aerospike/aerospike-backup-service:3.1.0
   config:
     service:
       http:

config/samples/secrets/cacert.pem

@@ -2,82 +2,82 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            4c:f5:06:ed:a1:d7:93:59:4a:f1:30:95:66:33:27:15:c5:4e:7d:c2
+            10:7c:42:36:0b:61:cc:97:b8:f2:22:fd:4d:68:21:f5:25:e6:02:d7
         Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C = US, ST = CA, L = Mountain View, O = "Aerospike, Inc.", OU = Engineering Test, CN = Root CA
+        Issuer: C=US, ST=CA, L=Mountain View, O=Aerospike, Inc., OU=Engineering Test, CN=Root CA
         Validity
-            Not Before: May 28 18:02:48 2021 GMT
-            Not After : May 28 18:02:48 2041 GMT
-        Subject: C = US, ST = CA, L = Mountain View, O = "Aerospike, Inc.", OU = Engineering Test, CN = Root CA
+            Not Before: Nov  5 12:18:46 2024 GMT
+            Not After : Nov  5 12:18:46 2044 GMT
+        Subject: C=US, ST=CA, L=Mountain View, O=Aerospike, Inc., OU=Engineering Test, CN=Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (2048 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:bf:6c:fb:23:f9:e9:a4:6b:62:b3:af:b9:df:e1:
-                    01:e8:cc:87:3b:9f:32:0b:21:70:b7:34:39:33:3e:
-                    77:cc:43:b9:5d:2b:63:fe:2b:21:d5:92:f4:92:35:
-                    49:b4:92:fc:00:dc:5d:9f:46:1d:f6:75:04:1c:87:
-                    c4:0d:3c:16:30:44:62:41:d9:a1:e9:ee:8d:6a:f6:
-                    92:35:e3:05:0d:2b:e1:56:29:d8:68:ec:bd:e9:26:
-                    36:09:54:2f:39:69:6e:93:d7:48:27:1d:fc:d1:5b:
-                    b8:00:10:05:c0:01:9b:34:91:38:8a:c2:b5:2f:4e:
-                    6b:2b:4a:99:c4:52:48:5e:da:52:80:cd:b5:fc:92:
-                    7e:ec:ca:d5:45:d3:bc:37:71:15:09:cc:6d:5b:14:
-                    04:c9:35:00:ce:e3:6c:e8:a1:b5:1a:15:14:47:47:
-                    ff:d2:d5:df:21:54:c5:de:61:1c:c4:20:07:82:9c:
-                    44:60:b7:b0:90:89:79:c8:23:fc:0d:a7:d7:93:0c:
-                    fe:a5:84:6e:c1:49:a7:53:d6:47:27:31:05:62:25:
-                    2c:78:f2:7a:3a:d2:21:9b:15:65:ac:48:90:92:8f:
-                    68:2b:37:b8:75:78:7a:e0:86:1f:16:1f:8c:bb:68:
-                    ec:00:3b:1b:6a:40:19:44:08:71:36:c3:0c:42:00:
-                    eb:d5
+                    00:a6:aa:32:58:53:fe:52:84:fb:35:3f:34:2c:a2:
+                    99:94:b2:43:7e:fd:45:36:f8:37:a7:15:3b:cf:24:
+                    c9:ba:28:58:53:0f:25:be:8a:3f:ea:f1:92:e4:e2:
+                    eb:85:12:0e:34:87:a7:0f:b9:a1:48:22:28:81:9d:
+                    9f:53:ef:53:a7:e0:10:f3:c7:e2:a3:ce:c5:4f:33:
+                    43:ac:4b:c8:66:c9:fb:7d:e9:8a:c0:7a:1e:aa:f6:
+                    8e:9a:b4:e4:ea:d9:62:35:eb:d6:b6:ad:6c:ac:2b:
+                    41:43:af:23:1d:a8:78:a4:ee:a8:b7:92:12:64:16:
+                    62:e5:54:70:ab:cd:d8:f0:81:21:e0:87:a5:6f:0f:
+                    cd:90:56:ca:e4:85:85:4d:2d:13:1b:1f:1a:1c:dd:
+                    1c:c4:e1:d7:30:57:50:b6:83:24:ff:36:bb:80:6d:
+                    6c:12:5c:f8:3c:bb:0b:04:8a:37:c4:16:71:d3:3b:
+                    e2:95:20:cc:8f:1f:be:1f:12:06:5a:59:28:f6:8b:
+                    0d:63:53:65:c1:01:7a:dd:2f:ca:8f:05:e1:ce:91:
+                    91:b1:fe:03:af:86:3e:79:00:67:76:f8:3a:58:b3:
+                    6a:22:32:25:8e:af:49:bf:53:fe:70:7a:42:0b:96:
+                    d3:ef:23:41:3f:99:5e:8f:9f:24:4d:c0:32:ab:69:
+                    a6:f5
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Key Usage: critical
                 Digital Signature, Certificate Sign, CRL Sign
             X509v3 Basic Constraints: critical
                 CA:TRUE
             X509v3 Subject Key Identifier: 
-                5C:D4:00:48:38:47:42:1F:3A:39:14:BC:D4:D5:B7:84:B8:83:44:CD
+                CD:4E:D3:E5:CB:DE:5D:E7:20:B5:16:7D:A0:51:74:0B:EF:75:71:76
             X509v3 Authority Key Identifier: 
-                keyid:5C:D4:00:48:38:47:42:1F:3A:39:14:BC:D4:D5:B7:84:B8:83:44:CD
-
+                CD:4E:D3:E5:CB:DE:5D:E7:20:B5:16:7D:A0:51:74:0B:EF:75:71:76
     Signature Algorithm: sha256WithRSAEncryption
-         4d:63:88:6d:38:9f:0f:cc:19:c8:40:6a:6f:5d:74:a8:0b:dc:
-         1d:b4:85:9a:f6:8e:8c:10:df:f0:57:ac:df:29:89:82:91:c1:
-         94:d2:e8:ec:9d:4d:80:2a:b6:01:bd:b0:0c:6f:54:62:22:81:
-         60:65:be:c3:22:d4:ae:57:25:c2:94:9c:1f:f4:65:bd:3e:8b:
-         09:0d:97:b6:b0:43:2a:e8:67:03:11:05:c1:d4:52:29:42:b9:
-         7e:4e:2a:b8:d1:53:67:56:5f:b5:4d:28:58:02:3b:d3:5c:89:
-         0e:ae:1f:ce:22:1e:17:fe:0c:f7:c3:55:1c:9b:ce:1b:2c:d6:
-         20:06:09:09:19:e8:e4:db:15:3b:d8:e1:fe:1c:21:4a:51:45:
-         9a:f2:3f:27:28:0c:ac:dd:b4:c9:0b:14:c4:65:17:64:7c:60:
-         21:0f:56:69:59:af:4e:c6:77:cc:17:76:e6:00:66:2f:b3:d5:
-         3b:07:a9:8c:1b:a5:76:4a:9c:7b:2f:a4:86:7a:e3:08:06:b7:
-         ca:05:39:72:85:0a:44:13:40:80:7b:f0:0a:69:b8:cd:b6:6b:
-         4a:ec:ea:74:28:8b:4f:3d:83:ab:32:e7:3a:f3:1b:95:e2:d9:
-         f5:4a:86:34:20:5c:37:6a:fc:d7:4b:40:b6:67:ab:82:95:ce:
-         3f:08:07:99
+    Signature Value:
+        a2:8d:c5:8d:84:79:b8:ab:4b:48:68:68:f4:a2:42:47:32:cf:
+        81:29:e5:08:7b:8e:6b:2b:4b:91:9c:7a:6c:01:40:94:c8:9f:
+        f1:1c:92:50:42:29:85:d9:ab:81:59:c0:1b:53:78:52:f5:53:
+        b9:2d:37:76:20:0b:c2:fb:ba:31:b5:50:3e:e9:29:e9:d5:33:
+        19:82:e2:91:d0:4a:63:98:f6:cf:fb:58:76:0d:1a:c9:e1:ce:
+        30:0e:0d:6b:73:0c:c0:8d:e1:52:73:49:39:61:ff:e9:fa:46:
+        75:5b:ca:4d:83:e1:18:d0:5b:a3:06:b4:7c:3e:6e:43:cd:ab:
+        6c:e5:69:3d:8e:51:93:1f:16:63:6d:70:b5:85:76:47:04:fb:
+        ce:47:89:26:c2:42:a5:b4:3d:92:2c:85:9a:fd:49:e9:f9:a3:
+        5b:a2:de:94:32:37:c8:c7:d8:8a:90:32:27:ee:a3:cb:c3:cf:
+        63:3d:c3:89:87:d3:f7:75:d2:78:f9:7b:67:2f:d6:33:d6:f2:
+        96:f2:bc:43:8d:3d:d7:05:0c:b5:1b:f9:b7:a0:00:51:1f:33:
+        ae:ee:73:e7:b7:24:86:1b:b9:b5:bf:43:a0:b3:bd:dd:f8:cd:
+        59:a1:02:04:bc:47:47:e3:bd:ab:c7:a5:49:29:6a:ba:d1:e8:
+        96:01:76:71
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----

config/samples/secrets/cacerts/8828a7d0.0

@@ -0,0 +1 @@
+ca-cert1.pem