mirror of
https://github.com/arangodb/kube-arangodb.git
synced 2024-12-14 11:57:37 +00:00
Remove support for RELATED_IMAGE_UBI, RELATED_IMAGE_DATABASE and RELATED_IMAGE_METRICSEXPORTER env vars (#1412)
This commit is contained in:
parent
25113b6e39
commit
332c9c2229
38 changed files with 19 additions and 219 deletions
|
@ -3,7 +3,8 @@
|
|||
## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
|
||||
- (Bugfix) Fix make manifests-crd-file command
|
||||
- (Improvement) Allow tcp:// and ssl:// protocols in endpoints for members
|
||||
- (Maintenance) Reorganize package imports / move common code to separate repos
|
||||
- (Maintenance) Reorganize package imports / move common code to separate repos
|
||||
- (Maintenance) Remove support for RELATED_IMAGE_UBI, RELATED_IMAGE_DATABASE and RELATED_IMAGE_METRICSEXPORTER env vars
|
||||
|
||||
## [1.2.33](https://github.com/arangodb/kube-arangodb/tree/1.2.33) (2023-09-27)
|
||||
- (Maintenance) Bump golang.org/x/net to v0.13.0
|
||||
|
|
|
@ -133,12 +133,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "{{ .Values.operator.images.base }}"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "{{ .Values.operator.images.metricsExporter }}"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "{{ .Values.operator.images.arango }}"
|
||||
{{- if .Values.operator.features.apps }}
|
||||
- name: ARANGOJOB_SA_NAME
|
||||
value: "{{ template "kube-arangodb.operatorName" . }}-job"
|
||||
|
|
|
@ -32,10 +32,6 @@ operator:
|
|||
backup: false
|
||||
apps: false
|
||||
k8sToK8sClusterSync: false
|
||||
images:
|
||||
base: alpine:3.11
|
||||
metricsExporter: arangodb/arangodb-exporter:0.1.7
|
||||
arango: arangodb/arangodb:latest
|
||||
tolerations: []
|
||||
rbac:
|
||||
enabled: true
|
||||
|
|
42
cmd/cmd.go
42
cmd/cmd.go
|
@ -47,7 +47,6 @@ import (
|
|||
"k8s.io/client-go/tools/record"
|
||||
|
||||
"github.com/arangodb/kube-arangodb/pkg/api"
|
||||
deploymentApi "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
|
||||
"github.com/arangodb/kube-arangodb/pkg/crd"
|
||||
agencyConfig "github.com/arangodb/kube-arangodb/pkg/deployment/agency/config"
|
||||
"github.com/arangodb/kube-arangodb/pkg/deployment/features"
|
||||
|
@ -72,23 +71,16 @@ import (
|
|||
)
|
||||
|
||||
const (
|
||||
defaultServerHost = "0.0.0.0"
|
||||
defaultServerPort = 8528
|
||||
defaultAPIHTTPPort = 8628
|
||||
defaultAPIGRPCPort = 8728
|
||||
defaultLogLevel = "debug"
|
||||
defaultAdminSecretName = "arangodb-operator-dashboard"
|
||||
defaultAPIJWTSecretName = "arangodb-operator-api-jwt"
|
||||
defaultAPIJWTKeySecretName = "arangodb-operator-api-jwt-key"
|
||||
defaultAlpineImage = "alpine:3.7"
|
||||
defaultMetricsExporterImage = "arangodb/arangodb-exporter:0.1.6"
|
||||
defaultArangoImage = "arangodb/arangodb:latest"
|
||||
defaultShutdownDelay = 2 * time.Second
|
||||
defaultShutdownTimeout = 30 * time.Second
|
||||
|
||||
UBIImageEnv util.EnvironmentVariable = "RELATED_IMAGE_UBI"
|
||||
ArangoImageEnv util.EnvironmentVariable = "RELATED_IMAGE_DATABASE"
|
||||
MetricsExporterImageEnv util.EnvironmentVariable = "RELATED_IMAGE_METRICSEXPORTER"
|
||||
defaultServerHost = "0.0.0.0"
|
||||
defaultServerPort = 8528
|
||||
defaultAPIHTTPPort = 8628
|
||||
defaultAPIGRPCPort = 8728
|
||||
defaultLogLevel = "debug"
|
||||
defaultAdminSecretName = "arangodb-operator-dashboard"
|
||||
defaultAPIJWTSecretName = "arangodb-operator-api-jwt"
|
||||
defaultAPIJWTKeySecretName = "arangodb-operator-api-jwt-key"
|
||||
defaultShutdownDelay = 2 * time.Second
|
||||
defaultShutdownTimeout = 30 * time.Second
|
||||
)
|
||||
|
||||
var (
|
||||
|
@ -134,8 +126,6 @@ var (
|
|||
|
||||
scalingIntegrationEnabled bool
|
||||
|
||||
alpineImage, metricsExporterImage, arangoImage string
|
||||
|
||||
reconciliationDelay time.Duration
|
||||
|
||||
singleMode bool
|
||||
|
@ -184,6 +174,7 @@ var (
|
|||
)
|
||||
|
||||
func init() {
|
||||
var deprecatedStr string
|
||||
|
||||
f := cmdMain.Flags()
|
||||
f.StringVar(&serverOptions.host, "server.host", defaultServerHost, "Host to listen on")
|
||||
|
@ -207,10 +198,12 @@ func init() {
|
|||
f.BoolVar(&operatorOptions.enableK2KClusterSync, "operator.k2k-cluster-sync", false, "Enable to run the ListSimple operator")
|
||||
f.MarkDeprecated("operator.k2k-cluster-sync", "Enabled within deployment operator")
|
||||
f.BoolVar(&operatorOptions.versionOnly, "operator.version", false, "Enable only version endpoint in Operator")
|
||||
f.StringVar(&operatorOptions.alpineImage, "operator.alpine-image", UBIImageEnv.GetOrDefault(defaultAlpineImage), "Docker image used for alpine containers")
|
||||
f.StringVar(&deprecatedStr, "operator.alpine-image", "alpine:3.7", "Docker image used for alpine containers")
|
||||
f.MarkDeprecated("operator.alpine-image", "Value is not used anymore")
|
||||
f.StringVar(&operatorOptions.metricsExporterImage, "operator.metrics-exporter-image", MetricsExporterImageEnv.GetOrDefault(defaultMetricsExporterImage), "Docker image used for metrics containers by default")
|
||||
f.StringVar(&operatorOptions.arangoImage, "operator.arango-image", ArangoImageEnv.GetOrDefault(defaultArangoImage), "Docker image used for arango by default")
|
||||
f.StringVar(&deprecatedStr, "operator.metrics-exporter-image", "arangodb/arangodb-exporter:0.1.6", "Docker image used for metrics containers by default")
|
||||
f.MarkDeprecated("operator.metrics-exporter-image", "Value is not used anymore")
|
||||
f.StringVar(&deprecatedStr, "operator.arango-image", "arangodb/arangodb:latest", "Docker image used for arango by default")
|
||||
f.MarkDeprecated("operator.arango-image", "Value is not used anymore")
|
||||
f.BoolVar(&chaosOptions.allowed, "chaos.allowed", false, "Set to allow chaos in deployments. Only activated when allowed and enabled in deployment")
|
||||
f.BoolVar(&operatorOptions.singleMode, "mode.single", false, "Enable single mode in Operator. WARNING: There should be only one replica of Operator, otherwise Operator can take unexpected actions")
|
||||
f.StringVar(&operatorOptions.scope, "scope", scope.DefaultScope.String(), "Define scope on which Operator works. Legacy - pre 1.1.0 scope with limited cluster access")
|
||||
|
@ -273,8 +266,6 @@ func executeMain(cmd *cobra.Command, args []string) {
|
|||
|
||||
go monitorMemoryLimit()
|
||||
|
||||
deploymentApi.DefaultImage = operatorOptions.arangoImage
|
||||
|
||||
globals.GetGlobalTimeouts().Kubernetes().Set(operatorTimeouts.k8s)
|
||||
globals.GetGlobalTimeouts().ArangoD().Set(operatorTimeouts.arangoD)
|
||||
globals.GetGlobalTimeouts().Agency().Set(operatorTimeouts.agency)
|
||||
|
@ -530,7 +521,6 @@ func newOperatorConfigAndDeps(id, namespace, name string) (operator.Config, oper
|
|||
EnableK2KClusterSync: operatorOptions.enableK2KClusterSync,
|
||||
AllowChaos: chaosOptions.allowed,
|
||||
ScalingIntegrationEnabled: operatorOptions.scalingIntegrationEnabled,
|
||||
ArangoImage: operatorOptions.arangoImage,
|
||||
SingleMode: operatorOptions.singleMode,
|
||||
Scope: scope,
|
||||
ReconciliationDelay: operatorOptions.reconciliationDelay,
|
||||
|
|
|
@ -847,12 +847,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
- name: ARANGOJOB_SA_NAME
|
||||
value: "arango-all-operator-job"
|
||||
ports:
|
||||
|
|
|
@ -317,12 +317,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
- name: ARANGOJOB_SA_NAME
|
||||
value: "arango-apps-operator-job"
|
||||
ports:
|
||||
|
|
|
@ -265,12 +265,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -262,12 +262,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -315,12 +315,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -262,12 +262,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -301,12 +301,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -847,12 +847,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
- name: ARANGOJOB_SA_NAME
|
||||
value: "arango-all-operator-job"
|
||||
ports:
|
||||
|
|
|
@ -317,12 +317,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
- name: ARANGOJOB_SA_NAME
|
||||
value: "arango-apps-operator-job"
|
||||
ports:
|
||||
|
|
|
@ -265,12 +265,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -262,12 +262,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -315,12 +315,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -262,12 +262,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -301,12 +301,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -847,12 +847,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
- name: ARANGOJOB_SA_NAME
|
||||
value: "arango-all-operator-job"
|
||||
ports:
|
||||
|
|
|
@ -317,12 +317,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
- name: ARANGOJOB_SA_NAME
|
||||
value: "arango-apps-operator-job"
|
||||
ports:
|
||||
|
|
|
@ -265,12 +265,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -262,12 +262,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -315,12 +315,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -262,12 +262,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- enterprise-k2kclustersync.yaml
|
|
@ -301,12 +301,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -847,12 +847,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
- name: ARANGOJOB_SA_NAME
|
||||
value: "arango-all-operator-job"
|
||||
ports:
|
||||
|
|
|
@ -317,12 +317,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
- name: ARANGOJOB_SA_NAME
|
||||
value: "arango-apps-operator-job"
|
||||
ports:
|
||||
|
|
|
@ -265,12 +265,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -262,12 +262,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -315,12 +315,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -262,12 +262,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -301,12 +301,6 @@ spec:
|
|||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: status.podIP
|
||||
- name: RELATED_IMAGE_UBI
|
||||
value: "alpine:3.11"
|
||||
- name: RELATED_IMAGE_METRICSEXPORTER
|
||||
value: "arangodb/arangodb-exporter:0.1.7"
|
||||
- name: RELATED_IMAGE_DATABASE
|
||||
value: "arangodb/arangodb:latest"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 8528
|
||||
|
|
|
@ -553,10 +553,6 @@ func (d *Deployment) SelectImageForMember(spec api.DeploymentSpec, status api.De
|
|||
return d.resources.SelectImageForMember(spec, status, member)
|
||||
}
|
||||
|
||||
func (d *Deployment) GetArangoImage() string {
|
||||
return d.config.ArangoImage
|
||||
}
|
||||
|
||||
func (d *Deployment) WithStatusUpdateErr(ctx context.Context, action reconciler.DeploymentStatusUpdateErrFunc) error {
|
||||
status := d.GetStatus()
|
||||
|
||||
|
|
|
@ -70,7 +70,6 @@ type Config struct {
|
|||
AllowChaos bool
|
||||
ScalingIntegrationEnabled bool
|
||||
OperatorImage string
|
||||
ArangoImage string
|
||||
ReconciliationDelay time.Duration
|
||||
Scope scope.Scope
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
//
|
||||
// DISCLAIMER
|
||||
//
|
||||
// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
|
||||
// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
|
@ -52,8 +52,6 @@ type Context interface {
|
|||
GetServerGroupIterator() reconciler.ServerGroupIterator
|
||||
// GetOperatorImage returns the image name of operator image
|
||||
GetOperatorImage() string
|
||||
// GetArangoImage returns the image name containing the default arango image
|
||||
GetArangoImage() string
|
||||
// CreateEvent creates a given event.
|
||||
// On error, the error is logged.
|
||||
CreateEvent(evt *k8sutil.Event)
|
||||
|
|
|
@ -95,7 +95,6 @@ type Config struct {
|
|||
PodName string
|
||||
ServiceAccount string
|
||||
OperatorImage string
|
||||
ArangoImage string
|
||||
EnableDeployment bool
|
||||
EnableDeploymentReplication bool
|
||||
EnableStorage bool
|
||||
|
|
|
@ -198,7 +198,6 @@ func (o *Operator) makeDeploymentConfigAndDeps() (deployment.Config, deployment.
|
|||
cfg := deployment.Config{
|
||||
ServiceAccount: o.Config.ServiceAccount,
|
||||
OperatorImage: o.Config.OperatorImage,
|
||||
ArangoImage: o.ArangoImage,
|
||||
AllowChaos: o.Config.AllowChaos,
|
||||
ScalingIntegrationEnabled: o.Config.ScalingIntegrationEnabled,
|
||||
ReconciliationDelay: o.Config.ReconciliationDelay,
|
||||
|
|
Loading…
Reference in a new issue