Merge branch 'master' into hearlessfix

aerospike · Sep 28, 2023 · 8bfcce1 · 8bfcce1
2 parents 73d99fd + f6cdb0a
commit 8bfcce1
Show file tree

Hide file tree

Showing 33 changed files with 24 additions and 72,729 deletions.
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -20,6 +20,8 @@ jobs:
           go-version: 1.19
       - name: Checkout sources
         uses: actions/checkout@v3
+        with:
+          submodules: true
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "pkg/configschema/schemas"]
+	path = pkg/configschema/schemas
+	url = https://github.com/aerospike/schemas
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -40,7 +40,13 @@ pipeline {
                         checkout([
                             $class: 'GitSCM',
                             branches: scm.branches,
-                            extensions: scm.extensions + [[$class: 'CleanBeforeCheckout']],
+                            extensions: scm.extensions + [[$class: 'CleanBeforeCheckout']] +
+                                        [[$class: 'SubmoduleOption',
+                                        disableSubmodules: false,
+                                        parentCredentials: false,
+                                        recursiveSubmodules: true,
+                                        reference: '',
+                                        trackingSubmodules: false]],
                             userRemoteConfigs: scm.userRemoteConfigs
                         ])
                     }

diff --git a/Makefile b/Makefile
@@ -247,6 +247,11 @@ enable-pre-commit:
 	pip3 install pre-commit
 	pre-commit install
 
+.PHONY: submodules
+submodules: ## Pull and update git submodules recursively
+	git pull --recurse-submodules
+	git submodule update --init --recursive
+
 # Generate bundle manifests and metadata, then validate generated files.
 # For OpenShift bundles run
 # CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.6 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:3.0.0 make bundle