File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed
internal/controller/postgrescluster Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 8
8
branches :
9
9
- master
10
10
11
+ env :
12
+ QUERIES_CONFIG_DIR : " ${{ github.workspace }}/hack/tools/queries"
13
+
11
14
jobs :
12
15
go-test :
13
16
runs-on : ubuntu-20.04
34
37
- uses : actions/setup-go@v3
35
38
with : { go-version: 1.x }
36
39
- run : go mod download
37
- - run : ENVTEST_K8S_VERSION="${KUBERNETES#default}" QUERIES_CONFIG_DIR="${QUERIES_CONFIG_DIR}" make check-envtest
40
+ - run : ENVTEST_K8S_VERSION="${KUBERNETES#default}" make check-envtest
38
41
env :
39
42
KUBERNETES : " ${{ matrix.kubernetes }}"
40
43
GO_TEST : go test --coverprofile 'envtest.coverage' --coverpkg ./internal/...
69
72
registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.19-3
70
73
registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.8-3
71
74
72
- - run : QUERIES_CONFIG_DIR="${QUERIES_CONFIG_DIR}" make createnamespaces check-envtest-existing
75
+ - run : make createnamespaces check-envtest-existing
73
76
env :
74
77
PGO_TEST_TIMEOUT_SCALE : 1.2
75
78
GO_TEST : go test --coverprofile 'envtest-existing.coverage' --coverpkg ./internal/...
Original file line number Diff line number Diff line change 48
48
)
49
49
50
50
func TestAddPGMonitorExporterToInstancePodSpec (t * testing.T ) {
51
- ctx := context .Background ()
52
-
53
51
image := "test/image:tag"
54
52
55
53
cluster := & v1beta1.PostgresCluster {}
@@ -151,7 +149,7 @@ func TestAddPGMonitorExporterToInstancePodSpec(t *testing.T) {
151
149
152
150
var foundDefaultQueriesMount bool
153
151
for _ , vm := range container .VolumeMounts {
154
- if vm .Name == "exporter-queries" && vm .MountPath == pgmonitor . GetQueriesConfigDir ( ctx ) {
152
+ if vm .Name == "exporter-queries" && vm .MountPath == "/opt/crunchy/conf" {
155
153
foundDefaultQueriesMount = true
156
154
break
157
155
}
You can’t perform that action at this time.
0 commit comments