Merge branch 'master' into feature/config_v1_integration

arangodb · Aug 26, 2024 · 2620f0c · 2620f0c
2 parents d092e65 + 1facdea
commit 2620f0c
Show file tree

Hide file tree

Showing 45 changed files with 20,797 additions and 12,589 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - (Feature) ServerGroup Pointer
 - (Feature) Envoy AuthV3 Integration
 - (Maintenance) Switch to ubuntu:24.04 base image
+- (Feature) Gateway Group for ArangoDeployment
 - (Feature) ConfigV1 Integration Service
 
 ## [1.2.42](https://github.com/arangodb/kube-arangodb/tree/1.2.42) (2024-07-23)

diff --git a/Makefile b/Makefile
@@ -475,7 +475,7 @@ $(BIN): $(VBIN_LINUX_AMD64) $(VBIN_OPS_LINUX_AMD64) $(VBIN_INT_LINUX_AMD64)
 	@cp "$(VBIN_OPS_LINUX_AMD64)" "$(BIN_OPS)"
 
 .PHONY: docker
-docker: check-vars $(VBIN_LINUX_AMD64) $(VBIN_LINUX_ARM64)
+docker: clean check-vars $(VBIN_LINUX_AMD64) $(VBIN_LINUX_ARM64)
 ifdef PUSHIMAGES
 	docker buildx build --no-cache -f $(DOCKERFILE) --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
 		--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" \

diff --git a/README.md b/README.md
@@ -74,6 +74,7 @@ covers individual newer features separately.
 
 | Feature                                                                       | Operator Version | Introduced | ArangoDB Version | ArangoDB Edition      | State        | Enabled | Flag                                                   | Remarks                                                                                   |
 |:------------------------------------------------------------------------------|:-----------------|:-----------|:-----------------|:----------------------|:-------------|:--------|:-------------------------------------------------------|:------------------------------------------------------------------------------------------|
+| Gateway                                                                       | 1.2.43           | 1.2.43     | >= 3.8.0         | Community, Enterprise | Alpha        | True    | N/A                                                    | Support for ArangoDeployment Gateway Group                                                |
 | Cleanup Imported Backups                                                      | 1.2.41           | 1.2.41     | >= 3.8.0         | Community, Enterprise | Production   | False   | --deployment.feature.backup-cleanup                    | Cleanup backups created outside of the Operator and imported into Kubernetes ArangoBackup |
 | Upscale resources spec in init containers                                     | 1.2.36           | 1.2.36     | >= 3.8.0         | Community, Enterprise | Production   | True    | --deployment.feature.init-containers-upscale-resources | Upscale resources spec to built-in init containers if they are not specified or lower     |
 | Create backups asynchronously                                                 | 1.2.35           | 1.2.41     | >= 3.8.0         | Community, Enterprise | Production   | True    | --deployment.feature.async-backup-creation             | Create backups asynchronously to avoid blocking the operator and reaching the timeout     |