Skip to content

Do not build initcontainer for imageid pod #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 10, 2018
Merged

Do not build initcontainer for imageid pod #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d36e9d3
Do not build initcontainer for imageid pod
ewoutp Jul 10, 2018
cd9203b
Fixed apiVersion
ewoutp Jul 10, 2018
101982f
Change-args tests are long
ewoutp Jul 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/templates/deployment/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: ""
apiVersion: v1
kind: Service
metadata:
name: {{ .Deployment.OperatorDeploymentName }}
Expand Down
4 changes: 3 additions & 1 deletion pkg/util/k8sutil/pods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,9 @@ func CreateArangodPod(kubecli kubernetes.Interface, developmentMode bool, deploy
p.Spec.Containers = append(p.Spec.Containers, c)

// Add UUID init container
p.Spec.InitContainers = append(p.Spec.InitContainers, arangodInitContainer("uuid", id, engine, alpineImage, requireUUID))
if alpineImage != "" {
p.Spec.InitContainers = append(p.Spec.InitContainers, arangodInitContainer("uuid", id, engine, alpineImage, requireUUID))
}

// Add volume
if pvcName != "" {
Expand Down
2 changes: 2 additions & 0 deletions tests/change_args_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import (
// TestChangeArgsAgents tests the creating of an active failover deployment
// with default settings and once ready changes the arguments of the agents.
func TestChangeArgsAgents(t *testing.T) {
longOrSkip(t)
c := client.MustNewInCluster()
kubecli := mustNewKubeClient(t)
ns := getNamespace(t)
Expand Down Expand Up @@ -119,6 +120,7 @@ func TestChangeArgsAgents(t *testing.T) {
// TestChangeArgsDBServer tests the creating of a cluster deployment
// with default settings and once ready changes the arguments of the dbservers.
func TestChangeArgsDBServer(t *testing.T) {
longOrSkip(t)
c := client.MustNewInCluster()
kubecli := mustNewKubeClient(t)
ns := getNamespace(t)
Expand Down