Skip to content

Commit e6da82c

Browse files
informalictinformalict
committed
test
1 parent 6a8c20e commit e6da82c

File tree

15 files changed

+46
-69
lines changed

15 files changed

+46
-69
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Change Log
22

33
## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
4+
- Drop support for ArangoDB <= 3.5 (versions already EOL)
45

56
## [1.2.0](https://github.com/arangodb/kube-arangodb/tree/1.2.0) (2021-07-16)
67
- Enable "Operator Internal Metrics Exporter" by default

‎README.md‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,32 @@ covers individual newer features separately.
3838

3939
| Platform | Kubernetes Version | ArangoDB Version | State | Remarks | Provider Remarks |
4040
|---------------------|--------------------|------------------|------------|-----------------------|------------------------------------|
41-
| Google GKE | 1.17 | >= 3.5.0 | Production | Don't use micro nodes | |
42-
| Google GKE | 1.18 | >= 3.5.0 | Production | Don't use micro nodes | |
43-
| Google GKE | 1.19 | >= 3.5.0 | Production | Don't use micro nodes | |
44-
| Google GKE | 1.20 | >= 3.5.0 | Production | Don't use micro nodes | |
45-
| Azure AKS | 1.18 | >= 3.5.0 | Production | | |
46-
| Azure AKS | 1.19 | >= 3.5.0 | Production | | |
47-
| Azure AKS | 1.20 | >= 3.5.0 | Production | | |
48-
| Amazon EKS | 1.16 | >= 3.5.0 | Production | | [Amazon EKS](./docs/providers/eks) |
49-
| Amazon EKS | 1.17 | >= 3.5.0 | Production | | [Amazon EKS](./docs/providers/eks) |
50-
| Amazon EKS | 1.18 | >= 3.5.0 | Production | | [Amazon EKS](./docs/providers/eks) |
51-
| Amazon EKS | 1.19 | >= 3.5.0 | Production | | [Amazon EKS](./docs/providers/eks) |
52-
| Amazon EKS | 1.20 | >= 3.5.0 | Production | | [Amazon EKS](./docs/providers/eks) |
53-
| IBM Cloud | 1.17 | >= 3.5.0 | Deprecated | | |
54-
| IBM Cloud | 1.18 | >= 3.5.0 | Production | | |
55-
| IBM Cloud | 1.19 | >= 3.5.0 | Production | | |
56-
| IBM Cloud | 1.20 | >= 3.5.0 | Production | | |
57-
| OpenShift | 3.11 | >= 3.5.0 | Production | | |
58-
| OpenShift | 4.2 | >= 3.5.0 | Production | | |
59-
| BareMetal (kubeadm) | 1.16 | >= 3.5.0 | Production | | |
60-
| BareMetal (kubeadm) | 1.17 | >= 3.5.0 | Production | | |
61-
| BareMetal (kubeadm) | 1.18 | >= 3.5.0 | Production | | |
62-
| BareMetal (kubeadm) | 1.19 | >= 3.5.0 | Production | | |
63-
| BareMetal (kubeadm) | 1.20 | >= 3.5.0 | Production | | |
64-
| BareMetal (kubeadm) | 1.21 | >= 3.5.0 | Production | | |
65-
| Minikube | 1.14+ | >= 3.5.0 | Devel Only | | |
66-
| Other | 1.14+ | >= 3.5.0 | Devel Only | | |
41+
| Google GKE | 1.17 | >= 3.6.0 | Production | Don't use micro nodes | |
42+
| Google GKE | 1.18 | >= 3.6.0 | Production | Don't use micro nodes | |
43+
| Google GKE | 1.19 | >= 3.6.0 | Production | Don't use micro nodes | |
44+
| Google GKE | 1.20 | >= 3.6.0 | Production | Don't use micro nodes | |
45+
| Azure AKS | 1.18 | >= 3.6.0 | Production | | |
46+
| Azure AKS | 1.19 | >= 3.6.0 | Production | | |
47+
| Azure AKS | 1.20 | >= 3.6.0 | Production | | |
48+
| Amazon EKS | 1.16 | >= 3.6.0 | Production | | [Amazon EKS](./docs/providers/eks) |
49+
| Amazon EKS | 1.17 | >= 3.6.0 | Production | | [Amazon EKS](./docs/providers/eks) |
50+
| Amazon EKS | 1.18 | >= 3.6.0 | Production | | [Amazon EKS](./docs/providers/eks) |
51+
| Amazon EKS | 1.19 | >= 3.6.0 | Production | | [Amazon EKS](./docs/providers/eks) |
52+
| Amazon EKS | 1.20 | >= 3.6.0 | Production | | [Amazon EKS](./docs/providers/eks) |
53+
| IBM Cloud | 1.17 | >= 3.6.0 | Deprecated | | |
54+
| IBM Cloud | 1.18 | >= 3.6.0 | Production | | |
55+
| IBM Cloud | 1.19 | >= 3.6.0 | Production | | |
56+
| IBM Cloud | 1.20 | >= 3.6.0 | Production | | |
57+
| OpenShift | 3.11 | >= 3.6.0 | Production | | |
58+
| OpenShift | 4.2 | >= 3.6.0 | Production | | |
59+
| BareMetal (kubeadm) | 1.16 | >= 3.6.0 | Production | | |
60+
| BareMetal (kubeadm) | 1.17 | >= 3.6.0 | Production | | |
61+
| BareMetal (kubeadm) | 1.18 | >= 3.6.0 | Production | | |
62+
| BareMetal (kubeadm) | 1.19 | >= 3.6.0 | Production | | |
63+
| BareMetal (kubeadm) | 1.20 | >= 3.6.0 | Production | | |
64+
| BareMetal (kubeadm) | 1.21 | >= 3.6.0 | Production | | |
65+
| Minikube | 1.14+ | >= 3.6.0 | Devel Only | | |
66+
| Other | 1.14+ | >= 3.6.0 | Devel Only | | |
6767

6868
Feature-wise production readiness table:
6969

@@ -89,9 +89,9 @@ Feature-wise production readiness table:
8989
| JWT Rotation Support | 1.1.0 | > 3.7.0 | Enterprise | Production | True | --deployment.feature.jwt-rotation | N/A |
9090
| Encryption Key Rotation Support | 1.0.4 | > 3.7.0 | Enterprise | Alpha | False | --deployment.feature.encryption-rotation | N/A |
9191
| Encryption Key Rotation Support | 1.1.0 | > 3.7.0 | Enterprise | Production | True | --deployment.feature.encryption-rotation | N/A |
92-
| Version Check | 1.1.4 | >= 3.5.0 | Community, Enterprise | Alpha | False | --deployment.feature.upgrade-version-check | N/A |
93-
| Operator Maintenance Management Support | 1.0.7 | >= 3.5.0 | Community, Enterprise | Alpha | False | --deployment.feature.maintenance | N/A |
94-
| Operator Maintenance Management Support | 1.2.0 | >= 3.5.0 | Community, Enterprise | Production | True | --deployment.feature.maintenance | N/A |
92+
| Version Check | 1.1.4 | >= 3.6.0 | Community, Enterprise | Alpha | False | --deployment.feature.upgrade-version-check | N/A |
93+
| Operator Maintenance Management Support | 1.0.7 | >= 3.6.0 | Community, Enterprise | Alpha | False | --deployment.feature.maintenance | N/A |
94+
| Operator Maintenance Management Support | 1.2.0 | >= 3.6.0 | Community, Enterprise | Production | True | --deployment.feature.maintenance | N/A |
9595
| Operator Internal Metrics Exporter | 1.1.9 | >= 3.6.0 | Community, Enterprise | Alpha | False | --deployment.feature.metrics-exporter | N/A |
9696
| Operator Internal Metrics Exporter | 1.2.0 | >= 3.6.0 | Community, Enterprise | Production | True | --deployment.feature.metrics-exporter | N/A |
9797

‎pkg/deployment/deployment_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import (
5757
const (
5858
testNamespace = "default"
5959
testDeploymentName = "test"
60-
testVersion = "3.5.2"
60+
testVersion = "3.7.0"
6161
testImage = "arangodb/arangodb:" + testVersion
6262
testCASecretName = "testCA"
6363
testJWTSecretName = "testJWT"

‎pkg/deployment/features/maintenance.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func init() {
2929
var maintenance = &feature{
3030
name: "maintenance",
3131
description: "Database maintenance mode management",
32-
version: "3.5.0",
32+
version: "3.6.0",
3333
enterpriseRequired: false,
3434
enabledByDefault: true,
3535
}

‎pkg/deployment/features/upgrade.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func init() {
2929
var upgradeVersionCheck Feature = &feature{
3030
name: "upgrade-version-check",
3131
description: "Enable initContainer with pre version check",
32-
version: "3.5.0",
32+
version: "3.6.0",
3333
enterpriseRequired: false,
3434
enabledByDefault: false,
3535
}

‎pkg/deployment/pod/builder.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,5 @@ type Input struct {
4747
type Builder interface {
4848
Args(i Input) k8sutil.OptionPairs
4949
Volumes(i Input) ([]core.Volume, []core.VolumeMount)
50-
Envs(i Input) []core.EnvVar
5150
Verify(i Input, cachedStatus interfaces.Inspector) error
5251
}

‎pkg/deployment/pod/encryption.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,6 @@ func Encryption() Builder {
124124

125125
type encryption struct{}
126126

127-
func (e encryption) Envs(i Input) []core.EnvVar {
128-
return nil
129-
}
130-
131127
func (e encryption) Args(i Input) k8sutil.OptionPairs {
132128
if !IsEncryptionEnabled(i) {
133129
return nil

‎pkg/deployment/pod/jwt.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// DISCLAIMER
33
//
4-
// Copyright 2020 ArangoDB GmbH, Cologne, Germany
4+
// Copyright 2020-2021 ArangoDB GmbH, Cologne, Germany
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
1818
// Copyright holder is ArangoDB GmbH, Cologne, Germany
1919
//
2020
// Author Adam Janikowski
21+
// Author Tomasz Mielech
2122
//
2223

2324
package pod
@@ -59,10 +60,6 @@ func JWT() Builder {
5960

6061
type jwt struct{}
6162

62-
func (e jwt) Envs(i Input) []core.EnvVar {
63-
return nil
64-
}
65-
6663
func (e jwt) Args(i Input) k8sutil.OptionPairs {
6764
if !IsAuthenticated(i) {
6865
// Without authentication

‎pkg/deployment/pod/sni.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// DISCLAIMER
33
//
4-
// Copyright 2020 ArangoDB GmbH, Cologne, Germany
4+
// Copyright 2020-2021 ArangoDB GmbH, Cologne, Germany
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
1818
// Copyright holder is ArangoDB GmbH, Cologne, Germany
1919
//
2020
// Author Adam Janikowski
21+
// Author Tomasz Mielech
2122
//
2223

2324
package pod
@@ -61,10 +62,6 @@ func SNI() Builder {
6162

6263
type sni struct{}
6364

64-
func (s sni) Envs(i Input) []core.EnvVar {
65-
return nil
66-
}
67-
6865
func (s sni) isSupported(i Input) bool {
6966
if !i.Deployment.TLS.IsSecure() {
7067
return false

‎pkg/deployment/pod/tls.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// DISCLAIMER
33
//
4-
// Copyright 2020 ArangoDB GmbH, Cologne, Germany
4+
// Copyright 2020-2021 ArangoDB GmbH, Cologne, Germany
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
1818
// Copyright holder is ArangoDB GmbH, Cologne, Germany
1919
//
2020
// Author Adam Janikowski
21+
// Author Tomasz Mielech
2122
//
2223

2324
package pod
@@ -55,10 +56,6 @@ func TLS() Builder {
5556

5657
type tls struct{}
5758

58-
func (s tls) Envs(i Input) []core.EnvVar {
59-
return nil
60-
}
61-
6259
func (s tls) Verify(i Input, cachedStatus interfaces.Inspector) error {
6360
if !IsTLSEnabled(i) {
6461
return nil

0 commit comments

Comments
 (0)