Skip to content

Commit 2ff254a

Browse files
committed
Attempt to fix evg run
1 parent 75ea1be commit 2ff254a

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
3131
BUNDLE_IMG ?= controller-bundle:$(VERSION)
3232

3333
# Image URL to use all building/pushing image targets
34-
IMG ?= localhost:5000/mongodb-kubernetes-operator
34+
IMG ?= quay.io/mongodb/mongodb-kubernetes-operator:0.5.0 # replace with localhost:5000/mongodb-kubernetes-operator locally
3535
DOCKERFILE ?= operator
3636
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
3737
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
@@ -94,6 +94,7 @@ generate: controller-gen
9494
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
9595

9696
# Generate Dockerfile
97+
.PHONY: dockerfile
9798
dockerfile:
9899
python scripts/dev/dockerfile_generator.py ${DOCKERFILE} > Dockerfile
99100

config/manager/kustomization.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ generatorOptions:
77
apiVersion: kustomize.config.k8s.io/v1beta1
88
kind: Kustomization
99
images:
10-
- name: controller
11-
newName: localhost:5000/mongodb-kubernetes-operator
1210
- name: mongodb-kubernetes-operator
13-
newName: localhost:5000/mongodb-kubernetes-operator
11+
newName: quay.io/mongodb/mongodb-kubernetes-operator:0.5.0

config/manager/manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
serviceAccountName: mongodb-kubernetes-operator
1717
containers:
1818
- name: mongodb-kubernetes-operator
19-
image: localhost:5000/mongodb-kubernetes-operator
19+
image: quay.io/mongodb/mongodb-kubernetes-operator:0.5.0
2020
command:
2121
- /usr/local/bin/entrypoint
2222
imagePullPolicy: Always

test/e2e/e2eutil.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
k8sClient "sigs.k8s.io/controller-runtime/pkg/client"
2323
)
2424

25-
const TestdataDir = "/testdata/tls"
25+
const TestdataDir = "/workspace/testdata/tls"
2626

2727
// UpdateMongoDBResource applies the provided function to the most recent version of the MongoDB resource
2828
// and retries when there are conflicts

0 commit comments

Comments
 (0)