Adds an option to use a local build of the website to supply binaries for the main operator image.

Use a deep copy when filling in pod spec information from the cluster spec to make the pod specs more stable.

Author: brownleej

.dockerignore

@@ -1 +0,0 @@
-foundationdb-kubernetes-sidecar

Dockerfile

@@ -4,13 +4,17 @@ FROM golang:1.12.5 as builder
 # Install FDB
 ARG FDB_VERSION=6.1.8
 ARG FDB_ADDITIONAL_VERSIONS="6.0.18"
+ARG FDB_WEBSITE=https://www.foundationdb.org
+
+COPY foundationdb-kubernetes-sidecar/website/ /mnt/website/
+
 RUN \
-	wget https://www.foundationdb.org/downloads/$FDB_VERSION/ubuntu/installers/foundationdb-clients_$FDB_VERSION-1_amd64.deb -O fdb.deb && \
+	curl $FDB_WEBSITE/downloads/$FDB_VERSION/ubuntu/installers/foundationdb-clients_$FDB_VERSION-1_amd64.deb -o fdb.deb && \
 	dpkg -i fdb.deb && rm fdb.deb && \
 	for version in ${FDB_VERSION} ${FDB_ADDITIONAL_VERSIONS}; do \
 		minor=${version%.*} && \
 		mkdir -p /usr/bin/fdb/$minor && \
-		wget https://www.foundationdb.org/downloads/$version/linux/fdb_$version.tar.gz -O /usr/bin/fdb/$minor/binaries.tar.gz && \
+		curl $FDB_WEBSITE/downloads/$version/linux/fdb_$version.tar.gz -o /usr/bin/fdb/$minor/binaries.tar.gz && \
 		tar --strip-components=1 -C /usr/bin/fdb/$minor -xzf /usr/bin/fdb/$minor/binaries.tar.gz && \
 		rm /usr/bin/fdb/$minor/binaries.tar.gz && \
 		for binary in fdbserver fdbmonitor backup_agent dr_agent; do \

Makefile

@@ -14,6 +14,9 @@ ifneq "$(go_subs)" ""
 	go_ld_flags := -ldflags "$(go_subs)"
 endif
 
+ifneq "$(FDB_WEBSITE)" ""
+	docker_build_args := $(docker_build_args) --build-arg FDB_WEBSITE=$(FDB_WEBSITE)
+endif
 
 # Run tests
 test: generate fmt vet manifests
@@ -63,7 +66,7 @@ endif
 
 # Build the docker image
 docker-build: test templates
-	docker build --build-arg "GO_BUILD_SUBS=${go_subs}" . -t ${IMG}
+	docker build ${docker_build_args} --build-arg "GO_BUILD_SUBS=${go_subs}" . -t ${IMG}
 	@echo "updating kustomize image patch file for manager resource"
 	sed -i'' -e 's@image: .*@image: '"${IMG}"'@' ./config/default/manager_image_patch.yaml
 

pkg/controller/foundationdbcluster/foundationdbcluster_controller.go

@@ -1503,7 +1503,7 @@ func customizeContainer(container *corev1.Container, overrides fdbtypes.Containe
 	fullEnv := []corev1.EnvVar{}
 
 	for _, envVar := range overrides.Env {
-		fullEnv = append(fullEnv, envVar)
+		fullEnv = append(fullEnv, *envVar.DeepCopy())
 		envOverrides[envVar.Name] = true
 	}
 
@@ -1514,7 +1514,10 @@ func customizeContainer(container *corev1.Container, overrides fdbtypes.Containe
 	}
 
 	container.Env = fullEnv
-	container.VolumeMounts = append(container.VolumeMounts, overrides.VolumeMounts...)
+
+	for _, volume := range overrides.VolumeMounts {
+		container.VolumeMounts = append(container.VolumeMounts, *volume.DeepCopy())
+	}
 }
 
 // GetPodSpec builds a pod spec for a FoundationDB pod
@@ -1644,7 +1647,10 @@ func GetPodSpec(cluster *fdbtypes.FoundationDBCluster, processClass string, podI
 		}}},
 		corev1.Volume{Name: "fdb-trace-logs", VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}}},
 	}
-	volumes = append(volumes, cluster.Spec.Volumes...)
+
+	for _, volume := range cluster.Spec.Volumes {
+		volumes = append(volumes, *volume.DeepCopy())
+	}
 
 	var affinity *corev1.Affinity