Skip to content

Commit 157e789

Browse files
committed
[Feature] [ACS] Initial
1 parent 3b874af commit 157e789

File tree

22 files changed

+653
-24
lines changed

22 files changed

+653
-24
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vendor/
88
deps/
99
.vscode/
1010
**/*.enterprise.go
11+
**/*.enterprise.go
1112
**/enterprise/**
1213
enterprise.mk
1314
local/

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- (Feature) Add CRD Installer
77
- (Bugfix) Assign imagePullSecrets to LocalStorage
88
- (Update) Bump K8S API to 1.21.10
9+
- (Feature) (ACS) Add ACS handler
910

1011
## [1.2.8](https://github.com/arangodb/kube-arangodb/tree/1.2.8) (2022-02-24)
1112
- Do not check License V2 on Community images

chart/kube-arangodb/templates/deployment-operator/role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ metadata:
1414
release: {{ .Release.Name }}
1515
rules:
1616
- apiGroups: ["database.arangodb.com"]
17-
resources: ["arangodeployments", "arangodeployments/status","arangomembers", "arangomembers/status"]
17+
resources: ["arangodeployments", "arangodeployments/status","arangomembers", "arangomembers/status", "arangoclustersynchronizations", "arangoclustersynchronizations/status"]
1818
verbs: ["*"]
1919
- apiGroups: [""]
2020
resources: ["pods", "services", "endpoints", "persistentvolumeclaims", "events", "secrets", "serviceaccounts"]

go.mod

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ require (
2828
github.com/arangodb/go-driver v1.2.1
2929
github.com/arangodb/go-driver/v2 v2.0.0-20211021031401-d92dcd5a4c83
3030
github.com/arangodb/go-upgrade-rules v0.0.0-20180809110947-031b4774ff21
31-
//github.com/arangodb/rebalancer v0.1.1
3231
github.com/cenkalti/backoff v2.2.1+incompatible
3332
github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9
3433
github.com/ghodss/yaml v1.0.0
@@ -55,11 +54,6 @@ require (
5554
k8s.io/klog v1.0.0
5655
)
5756

58-
require (
59-
github.com/arangodb/rebalancer v0.1.1
60-
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
61-
)
62-
6357
require (
6458
github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
6559
github.com/beorn7/perks v1.0.1 // indirect
@@ -102,6 +96,7 @@ require (
10296
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
10397
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
10498
golang.org/x/text v0.3.6 // indirect
99+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
105100
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
106101
google.golang.org/appengine v1.6.7 // indirect
107102
google.golang.org/protobuf v1.27.1 // indirect

pkg/apis/deployment/v1/cluster_synchronization_spec.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,12 @@
2121
package v1
2222

2323
type ArangoClusterSynchronizationSpec struct {
24+
DeploymentName string `json:"deploymentName,omitempty"`
25+
KubeConfig *ArangoClusterSynchronizationKubeConfigSpec `json:"kubeconfig,omitempty"`
26+
}
27+
28+
type ArangoClusterSynchronizationKubeConfigSpec struct {
29+
SecretName string `json:"secretName"`
30+
SecretKey string `json:"secretKey"`
31+
Namespace string `json:"namespace"`
2432
}

pkg/apis/deployment/v1/cluster_synchronization_status.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,15 @@
2020

2121
package v1
2222

23+
import "k8s.io/apimachinery/pkg/types"
24+
2325
type ArangoClusterSynchronizationStatus struct {
26+
Deployment *ArangoClusterSynchronizationDeploymentStatus `json:"deployment,omitempty"`
27+
Conditions ConditionList `json:"conditions,omitempty"`
28+
}
29+
30+
type ArangoClusterSynchronizationDeploymentStatus struct {
31+
Name string `json:"name"`
32+
Namespace string `json:"namespace"`
33+
UID types.UID `json:"uid"`
2434
}

pkg/apis/deployment/v1/zz_generated.deepcopy.go

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

pkg/apis/deployment/v2alpha1/cluster_synchronization_spec.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,11 @@
2121
package v2alpha1
2222

2323
type ArangoClusterSynchronizationSpec struct {
24+
DeploymentName *string `json:"deploymentName,omitempty"`
25+
KubeConfig *ArangoClusterSynchronizationKubeConfigSpec `json:"kubeconfig,omitempty"`
26+
}
27+
28+
type ArangoClusterSynchronizationKubeConfigSpec struct {
29+
SecretName string `json:"secretName"`
30+
Namespace string `json:"namespace"`
2431
}

pkg/apis/deployment/v2alpha1/cluster_synchronization_status.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,17 @@
2020

2121
package v2alpha1
2222

23+
import "k8s.io/apimachinery/pkg/types"
24+
2325
type ArangoClusterSynchronizationStatus struct {
26+
Deployment *ArangoClusterSynchronizationDeploymentStatus `json:"deployment,omitempty"`
27+
KubeConfig *ArangoClusterSynchronizationKubeConfigStatus `json:"kubeconfig,omitempty"`
28+
}
29+
30+
type ArangoClusterSynchronizationDeploymentStatus struct {
31+
UID types.UID `json:"UID"`
32+
}
33+
34+
type ArangoClusterSynchronizationKubeConfigStatus struct {
35+
Conditions ConditionList `json:"conditions,omitempty"`
2436
}

pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go

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

0 commit comments

Comments
 (0)