diff --git a/CHANGELOG.md b/CHANGELOG.md index 28f6bbdd0..0fae10f9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/chart/kube-arangodb/templates/deployment.yaml b/chart/kube-arangodb/templates/deployment.yaml index 685017e54..ce7af0522 100644 --- a/chart/kube-arangodb/templates/deployment.yaml +++ b/chart/kube-arangodb/templates/deployment.yaml @@ -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" diff --git a/chart/kube-arangodb/values.yaml b/chart/kube-arangodb/values.yaml index 1328315b5..2703cccff 100644 --- a/chart/kube-arangodb/values.yaml +++ b/chart/kube-arangodb/values.yaml @@ -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 diff --git a/cmd/cmd.go b/cmd/cmd.go index a248c9eb2..e62092f30 100644 --- a/cmd/cmd.go +++ b/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, diff --git a/manifests/arango-all.yaml b/manifests/arango-all.yaml index 1523b13c6..4c03ba0b0 100644 --- a/manifests/arango-all.yaml +++ b/manifests/arango-all.yaml @@ -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: diff --git a/manifests/arango-apps.yaml b/manifests/arango-apps.yaml index 8c3bed22f..b6c93ed4d 100644 --- a/manifests/arango-apps.yaml +++ b/manifests/arango-apps.yaml @@ -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: diff --git a/manifests/arango-backup.yaml b/manifests/arango-backup.yaml index 7fd49008e..626a5c116 100644 --- a/manifests/arango-backup.yaml +++ b/manifests/arango-backup.yaml @@ -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 diff --git a/manifests/arango-deployment-replication.yaml b/manifests/arango-deployment-replication.yaml index 11774f5d8..4cbd1c951 100644 --- a/manifests/arango-deployment-replication.yaml +++ b/manifests/arango-deployment-replication.yaml @@ -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 diff --git a/manifests/arango-deployment.yaml b/manifests/arango-deployment.yaml index 05bc1061e..3d814aa1a 100644 --- a/manifests/arango-deployment.yaml +++ b/manifests/arango-deployment.yaml @@ -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 diff --git a/manifests/arango-k2kclustersync.yaml b/manifests/arango-k2kclustersync.yaml index 198972855..deac655ec 100644 --- a/manifests/arango-k2kclustersync.yaml +++ b/manifests/arango-k2kclustersync.yaml @@ -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 diff --git a/manifests/arango-storage.yaml b/manifests/arango-storage.yaml index fe6db0613..cc6e80d04 100644 --- a/manifests/arango-storage.yaml +++ b/manifests/arango-storage.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 diff --git a/manifests/enterprise-all.yaml b/manifests/enterprise-all.yaml index 79fd858cd..b86894c8b 100644 --- a/manifests/enterprise-all.yaml +++ b/manifests/enterprise-all.yaml @@ -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: diff --git a/manifests/enterprise-apps.yaml b/manifests/enterprise-apps.yaml index 1253be9b0..521104f46 100644 --- a/manifests/enterprise-apps.yaml +++ b/manifests/enterprise-apps.yaml @@ -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: diff --git a/manifests/enterprise-backup.yaml b/manifests/enterprise-backup.yaml index 9fa59326d..9806bdb38 100644 --- a/manifests/enterprise-backup.yaml +++ b/manifests/enterprise-backup.yaml @@ -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 diff --git a/manifests/enterprise-deployment-replication.yaml b/manifests/enterprise-deployment-replication.yaml index a11e4d8fe..076958329 100644 --- a/manifests/enterprise-deployment-replication.yaml +++ b/manifests/enterprise-deployment-replication.yaml @@ -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 diff --git a/manifests/enterprise-deployment.yaml b/manifests/enterprise-deployment.yaml index 5346b075c..f4224b9f4 100644 --- a/manifests/enterprise-deployment.yaml +++ b/manifests/enterprise-deployment.yaml @@ -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 diff --git a/manifests/enterprise-k2kclustersync.yaml b/manifests/enterprise-k2kclustersync.yaml index 76fed429f..ab3e385d1 100644 --- a/manifests/enterprise-k2kclustersync.yaml +++ b/manifests/enterprise-k2kclustersync.yaml @@ -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 diff --git a/manifests/enterprise-storage.yaml b/manifests/enterprise-storage.yaml index 1804701a3..a2d0543ec 100644 --- a/manifests/enterprise-storage.yaml +++ b/manifests/enterprise-storage.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 diff --git a/manifests/kustomize-enterprise/all/enterprise-all.yaml b/manifests/kustomize-enterprise/all/enterprise-all.yaml index 79fd858cd..b86894c8b 100644 --- a/manifests/kustomize-enterprise/all/enterprise-all.yaml +++ b/manifests/kustomize-enterprise/all/enterprise-all.yaml @@ -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: diff --git a/manifests/kustomize-enterprise/apps/enterprise-apps.yaml b/manifests/kustomize-enterprise/apps/enterprise-apps.yaml index 1253be9b0..521104f46 100644 --- a/manifests/kustomize-enterprise/apps/enterprise-apps.yaml +++ b/manifests/kustomize-enterprise/apps/enterprise-apps.yaml @@ -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: diff --git a/manifests/kustomize-enterprise/backup/enterprise-backup.yaml b/manifests/kustomize-enterprise/backup/enterprise-backup.yaml index 9fa59326d..9806bdb38 100644 --- a/manifests/kustomize-enterprise/backup/enterprise-backup.yaml +++ b/manifests/kustomize-enterprise/backup/enterprise-backup.yaml @@ -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 diff --git a/manifests/kustomize-enterprise/deployment-replication/enterprise-deployment-replication.yaml b/manifests/kustomize-enterprise/deployment-replication/enterprise-deployment-replication.yaml index a11e4d8fe..076958329 100644 --- a/manifests/kustomize-enterprise/deployment-replication/enterprise-deployment-replication.yaml +++ b/manifests/kustomize-enterprise/deployment-replication/enterprise-deployment-replication.yaml @@ -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 diff --git a/manifests/kustomize-enterprise/deployment/enterprise-deployment.yaml b/manifests/kustomize-enterprise/deployment/enterprise-deployment.yaml index 5346b075c..f4224b9f4 100644 --- a/manifests/kustomize-enterprise/deployment/enterprise-deployment.yaml +++ b/manifests/kustomize-enterprise/deployment/enterprise-deployment.yaml @@ -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 diff --git a/manifests/kustomize-enterprise/k2kclustersync/enterprise-k2kclustersync.yaml b/manifests/kustomize-enterprise/k2kclustersync/enterprise-k2kclustersync.yaml index 76fed429f..ab3e385d1 100644 --- a/manifests/kustomize-enterprise/k2kclustersync/enterprise-k2kclustersync.yaml +++ b/manifests/kustomize-enterprise/k2kclustersync/enterprise-k2kclustersync.yaml @@ -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 diff --git a/manifests/kustomize-enterprise/k2kclustersync/kustomization.yaml b/manifests/kustomize-enterprise/k2kclustersync/kustomization.yaml index 5160054fa..e69de29bb 100644 --- a/manifests/kustomize-enterprise/k2kclustersync/kustomization.yaml +++ b/manifests/kustomize-enterprise/k2kclustersync/kustomization.yaml @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - enterprise-k2kclustersync.yaml diff --git a/manifests/kustomize-enterprise/storage/enterprise-storage.yaml b/manifests/kustomize-enterprise/storage/enterprise-storage.yaml index 1804701a3..a2d0543ec 100644 --- a/manifests/kustomize-enterprise/storage/enterprise-storage.yaml +++ b/manifests/kustomize-enterprise/storage/enterprise-storage.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 diff --git a/manifests/kustomize/all/arango-all.yaml b/manifests/kustomize/all/arango-all.yaml index 1523b13c6..4c03ba0b0 100644 --- a/manifests/kustomize/all/arango-all.yaml +++ b/manifests/kustomize/all/arango-all.yaml @@ -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: diff --git a/manifests/kustomize/apps/arango-apps.yaml b/manifests/kustomize/apps/arango-apps.yaml index 8c3bed22f..b6c93ed4d 100644 --- a/manifests/kustomize/apps/arango-apps.yaml +++ b/manifests/kustomize/apps/arango-apps.yaml @@ -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: diff --git a/manifests/kustomize/backup/arango-backup.yaml b/manifests/kustomize/backup/arango-backup.yaml index 7fd49008e..626a5c116 100644 --- a/manifests/kustomize/backup/arango-backup.yaml +++ b/manifests/kustomize/backup/arango-backup.yaml @@ -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 diff --git a/manifests/kustomize/deployment-replication/arango-deployment-replication.yaml b/manifests/kustomize/deployment-replication/arango-deployment-replication.yaml index 11774f5d8..4cbd1c951 100644 --- a/manifests/kustomize/deployment-replication/arango-deployment-replication.yaml +++ b/manifests/kustomize/deployment-replication/arango-deployment-replication.yaml @@ -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 diff --git a/manifests/kustomize/deployment/arango-deployment.yaml b/manifests/kustomize/deployment/arango-deployment.yaml index 05bc1061e..3d814aa1a 100644 --- a/manifests/kustomize/deployment/arango-deployment.yaml +++ b/manifests/kustomize/deployment/arango-deployment.yaml @@ -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 diff --git a/manifests/kustomize/k2kclustersync/arango-k2kclustersync.yaml b/manifests/kustomize/k2kclustersync/arango-k2kclustersync.yaml index 198972855..deac655ec 100644 --- a/manifests/kustomize/k2kclustersync/arango-k2kclustersync.yaml +++ b/manifests/kustomize/k2kclustersync/arango-k2kclustersync.yaml @@ -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 diff --git a/manifests/kustomize/storage/arango-storage.yaml b/manifests/kustomize/storage/arango-storage.yaml index fe6db0613..cc6e80d04 100644 --- a/manifests/kustomize/storage/arango-storage.yaml +++ b/manifests/kustomize/storage/arango-storage.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 diff --git a/pkg/deployment/context_impl.go b/pkg/deployment/context_impl.go index e03c0b78d..61298e3df 100644 --- a/pkg/deployment/context_impl.go +++ b/pkg/deployment/context_impl.go @@ -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() diff --git a/pkg/deployment/deployment.go b/pkg/deployment/deployment.go index 7449ec706..d265d139a 100644 --- a/pkg/deployment/deployment.go +++ b/pkg/deployment/deployment.go @@ -70,7 +70,6 @@ type Config struct { AllowChaos bool ScalingIntegrationEnabled bool OperatorImage string - ArangoImage string ReconciliationDelay time.Duration Scope scope.Scope } diff --git a/pkg/deployment/resources/context.go b/pkg/deployment/resources/context.go index 38fbffb81..b3f63b6a3 100644 --- a/pkg/deployment/resources/context.go +++ b/pkg/deployment/resources/context.go @@ -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) diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index 308682e7a..8859a92db 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -95,7 +95,6 @@ type Config struct { PodName string ServiceAccount string OperatorImage string - ArangoImage string EnableDeployment bool EnableDeploymentReplication bool EnableStorage bool diff --git a/pkg/operator/operator_deployment.go b/pkg/operator/operator_deployment.go index 6e4bbedf6..c18486daa 100644 --- a/pkg/operator/operator_deployment.go +++ b/pkg/operator/operator_deployment.go @@ -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,