Skip to content

Commit db5406e

Browse files
authored
[Feature] [Gateway] SNI and Authz support (#1714)
1 parent efbbc79 commit db5406e

Some content is hidden

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

47 files changed

+623
-280
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
- (Bugfix) Fix race condition in ArangoBackup
2222
- (Feature) Improve Gateway Config gen
2323
- (Feature) Integration Service TLS
24+
- (Feature) (Gateway) SNI and Authz support
2425

2526
## [1.2.42](https://github.com/arangodb/kube-arangodb/tree/1.2.42) (2024-07-23)
2627
- (Maintenance) Go 1.22.4 & Kubernetes 1.29.6 libraries

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ FROM ${ENVOY_IMAGE} AS envoy
77

88
FROM ${IMAGE} AS base
99

10-
RUN apt-get update && apt-get upgrade -y && apt-get clean
10+
ARG BUILD_SKIP_UPDATE=false
11+
ENV BUILD_SKIP_UPDATE=${BUILD_SKIP_UPDATE}
12+
RUN if [ X"${BUILD_SKIP_UPDATE}" = X"true" ]; then echo "Update skipped!"; else apt-get update && apt-get upgrade -y && apt-get clean; fi
1113

1214
FROM base
1315

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ ifndef LOCALONLY
121121
PUSHIMAGES := 1
122122
endif
123123

124+
BUILD_SKIP_UPDATE ?= false
125+
124126
ifdef IMAGETAG
125127
IMAGESUFFIX := :$(IMAGETAG)
126128
else
@@ -272,7 +274,7 @@ NON_EE_SOURCES := $(shell $(NON_EE_SOURCES_QUERY))
272274

273275
YAML_EXCLUDE_DIRS := vendor .gobuild deps tools pkg/generated/clientset pkg/generated/informers pkg/generated/listers \
274276
chart/kube-arangodb/templates chart/kube-arangodb-arm64/templates chart/kube-arangodb-enterprise/templates chart/kube-arangodb-enterprise-arm64/templates \
275-
chart/kube-arangodb-crd/templates chart/arangodb-ingress-proxy/templates
277+
chart/kube-arangodb-crd/templates
276278
YAML_EXCLUDE_FILES :=
277279
YAML_QUERY := find ./ -type f -name '*.yaml' $(foreach EXCLUDE_DIR,$(YAML_EXCLUDE_DIRS), ! -path "*/$(EXCLUDE_DIR)/*") $(foreach EXCLUDE_FILE,$(YAML_EXCLUDE_FILES), ! -path "*/$(EXCLUDE_FILE)")
278280
YAMLS := $(shell $(YAML_QUERY))
@@ -478,11 +480,11 @@ $(BIN): $(VBIN_LINUX_AMD64) $(VBIN_OPS_LINUX_AMD64) $(VBIN_INT_LINUX_AMD64)
478480
docker: clean check-vars $(VBIN_LINUX_AMD64) $(VBIN_LINUX_ARM64)
479481
ifdef PUSHIMAGES
480482
docker buildx build --no-cache -f $(DOCKERFILE) --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
481-
--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" \
483+
--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" --build-arg "BUILD_SKIP_UPDATE=${BUILD_SKIP_UPDATE}" \
482484
--platform linux/amd64,linux/arm64 --push -t $(OPERATORIMAGE) .
483485
else
484486
docker buildx build --no-cache -f $(DOCKERFILE) --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
485-
--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" \
487+
--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" --build-arg "BUILD_SKIP_UPDATE=${BUILD_SKIP_UPDATE}" \
486488
--platform linux/amd64,linux/arm64 -t $(OPERATORIMAGE) .
487489
endif
488490

@@ -802,6 +804,7 @@ set-typed-api-version/%:
802804
@grep -rHn "github.com/arangodb/kube-arangodb/pkg/generated/clientset/versioned/typed/$*/v[A-Za-z0-9]\+" \
803805
"$(ROOT)/pkg/deployment/" \
804806
"$(ROOT)/pkg/replication/" \
807+
"$(ROOT)/pkg/integrations/" \
805808
"$(ROOT)/pkg/operator/" \
806809
"$(ROOT)/pkg/operatorV2/" \
807810
"$(ROOT)/pkg/server/" \
@@ -818,6 +821,7 @@ set-api-version/%:
818821
@grep -rHn "github.com/arangodb/kube-arangodb/pkg/apis/$*/v[A-Za-z0-9]\+" \
819822
"$(ROOT)/pkg/deployment/" \
820823
"$(ROOT)/pkg/replication/" \
824+
"$(ROOT)/pkg/integrations/" \
821825
"$(ROOT)/pkg/operator/" \
822826
"$(ROOT)/pkg/operatorV2/" \
823827
"$(ROOT)/pkg/server/" \
@@ -831,6 +835,7 @@ set-api-version/%:
831835
@grep -rHn "DatabaseV[A-Za-z0-9]\+()" \
832836
"$(ROOT)/pkg/deployment/" \
833837
"$(ROOT)/pkg/replication/" \
838+
"$(ROOT)/pkg/integrations/" \
834839
"$(ROOT)/pkg/operator/" \
835840
"$(ROOT)/pkg/operatorV2/" \
836841
"$(ROOT)/pkg/server/" \
@@ -844,6 +849,7 @@ set-api-version/%:
844849
@grep -rHn "ReplicationV[A-Za-z0-9]\+()" \
845850
"$(ROOT)/pkg/deployment/" \
846851
"$(ROOT)/pkg/replication/" \
852+
"$(ROOT)/pkg/integrations/" \
847853
"$(ROOT)/pkg/operator/" \
848854
"$(ROOT)/pkg/operatorV2/" \
849855
"$(ROOT)/pkg/server/" \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ Flags:
182182
--kubernetes.max-batch-size int Size of batch during objects read (default 256)
183183
--kubernetes.qps float32 Number of queries per second for k8s API (default 15)
184184
--log.format string Set log format. Allowed values: 'pretty', 'JSON'. If empty, default format is used (default "pretty")
185-
--log.level stringArray Set log levels in format <level> or <logger>=<level>. Possible loggers: action, agency, api-server, assertion, backup-operator, chaos-monkey, crd, deployment, deployment-ci, deployment-reconcile, deployment-replication, deployment-resilience, deployment-resources, deployment-storage, deployment-storage-pc, deployment-storage-service, http, inspector, integration-config-v1, integrations, k8s-client, kubernetes-informer, monitor, networking-route-operator, operator, operator-arangojob-handler, operator-v2, operator-v2-event, operator-v2-worker, panics, pod_compare, root, root-event-recorder, server, server-authentication (default [info])
185+
--log.level stringArray Set log levels in format <level> or <logger>=<level>. Possible loggers: action, agency, api-server, assertion, backup-operator, chaos-monkey, crd, deployment, deployment-ci, deployment-reconcile, deployment-replication, deployment-resilience, deployment-resources, deployment-storage, deployment-storage-pc, deployment-storage-service, http, inspector, integration-config-v1, integration-envoy-auth-v3, integrations, k8s-client, kubernetes-informer, monitor, networking-route-operator, operator, operator-arangojob-handler, operator-v2, operator-v2-event, operator-v2-worker, panics, pod_compare, root, root-event-recorder, server, server-authentication (default [info])
186186
--log.sampling If true, operator will try to minimize duplication of logging events (default true)
187187
--memory-limit uint Define memory limit for hard shutdown and the dump of goroutines. Used for testing
188188
--metrics.excluded-prefixes stringArray List of the excluded metrics prefixes

chart/arangodb-ingress-proxy/Chart.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

chart/arangodb-ingress-proxy/LICENSE

Lines changed: 0 additions & 15 deletions
This file was deleted.

chart/arangodb-ingress-proxy/README.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

chart/arangodb-ingress-proxy/templates/NOTES.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

chart/arangodb-ingress-proxy/templates/_helpers.tpl

Lines changed: 0 additions & 15 deletions
This file was deleted.

chart/arangodb-ingress-proxy/templates/configmap.yaml

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)