Skip to content
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

Jump to bottom

Update downloaded SDK version and update deprecated struct name #1133

Merged
merged 1 commit into from
Jul 22, 2020
Merged

Update downloaded SDK version and update deprecated struct name #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PROMETHEUS_OPERATOR_TAG ?= v0.39.0
PROMETHEUS_RULES_CRD ?= https://raw.githubusercontent.com/coreos/prometheus-operator/${PROMETHEUS_OPERATOR_TAG}/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
PROMETHEUS_SERVICE_MONITORS_CRD ?= https://raw.githubusercontent.com/coreos/prometheus-operator/${PROMETHEUS_OPERATOR_TAG}/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
ES_OPERATOR_IMAGE ?= quay.io/openshift/origin-elasticsearch-operator:4.4
SDK_VERSION=v0.15.1
SDK_VERSION=v0.18.2
chlunde marked this conversation as resolved.
Show resolved Hide resolved
GOPATH ?= "$(HOME)/go"

LD_FLAGS ?= "-X $(VERSION_PKG).version=$(OPERATOR_VERSION) -X $(VERSION_PKG).buildDate=$(VERSION_DATE) -X $(VERSION_PKG).defaultJaeger=$(JAEGER_VERSION)"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ func GetPod(namespace, namePrefix, containsImage string, kubeclient kubernetes.I
return *emptyPod
}

func prepare(t *testing.T) (*framework.TestCtx, error) {
func prepare(t *testing.T) (*framework.Context, error) {
t.Logf("debug mode: %v", debugMode)
ctx := framework.NewTestCtx(t)
ctx := framework.NewContext(t)
// Install jaeger-operator unless we've installed it from OperatorHub
start := time.Now()
if !usingOLM {
Expand Down