Skip to content

Commit 9f8993c

Browse files
authored
[Feature] Deprecate Alpine Image usage (#745)
1 parent 92198ec commit 9f8993c

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
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+
- Deprecate Alpine image usage
45
- Use persistent name and namespace in ArangoDeployment reconcilation loop
56

67
## [1.1.9](https://github.com/arangodb/kube-arangodb/tree/1.1.9) (2021-05-28)

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ func init() {
145145
f.BoolVar(&operatorOptions.enableStorage, "operator.storage", false, "Enable to run the ArangoLocalStorage operator")
146146
f.BoolVar(&operatorOptions.enableBackup, "operator.backup", false, "Enable to run the ArangoBackup operator")
147147
f.StringVar(&operatorOptions.alpineImage, "operator.alpine-image", UBIImageEnv.GetOrDefault(defaultAlpineImage), "Docker image used for alpine containers")
148+
f.MarkDeprecated("operator.alpine-image", "Value is not used anymore")
148149
f.StringVar(&operatorOptions.metricsExporterImage, "operator.metrics-exporter-image", MetricsExporterImageEnv.GetOrDefault(defaultMetricsExporterImage), "Docker image used for metrics containers by default")
149150
f.StringVar(&operatorOptions.arangoImage, "operator.arango-image", ArangoImageEnv.GetOrDefault(defaultArangoImage), "Docker image used for arango by default")
150151
f.BoolVar(&chaosOptions.allowed, "chaos.allowed", false, "Set to allow chaos in deployments. Only activated when allowed and enabled in deployment")
@@ -328,7 +329,6 @@ func newOperatorConfigAndDeps(id, namespace, name string) (operator.Config, oper
328329
EnableStorage: operatorOptions.enableStorage,
329330
EnableBackup: operatorOptions.enableBackup,
330331
AllowChaos: chaosOptions.allowed,
331-
AlpineImage: operatorOptions.alpineImage,
332332
MetricsExporterImage: operatorOptions.metricsExporterImage,
333333
ArangoImage: operatorOptions.arangoImage,
334334
SingleMode: operatorOptions.singleMode,

pkg/operator/operator.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ type Config struct {
8888
PodName string
8989
ServiceAccount string
9090
LifecycleImage string
91-
AlpineImage string
9291
ArangoImage string
9392
MetricsExporterImage string
9493
EnableDeployment bool

pkg/util/k8sutil/pods.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ func RocksdbEncryptionReadOnlyVolumeMount() core.VolumeMount {
274274
func ArangodInitContainer(name, id, engine, executable, operatorImage string, requireUUID bool, securityContext *core.SecurityContext) core.Container {
275275
uuidFile := filepath.Join(ArangodVolumeMountDir, "UUID")
276276
engineFile := filepath.Join(ArangodVolumeMountDir, "ENGINE")
277-
var command []string = []string{
277+
var command = []string{
278278
executable,
279279
"uuid",
280280
"--uuid-path",

0 commit comments

Comments
 (0)