Skip to content

Commit c08b553

Browse files
juevyalosevldmonster
authored
fix: restore jqFilters (#756)
Signed-off-by: Pavel Okhlopkov <[email protected]> Co-authored-by: Yuriy Losev <[email protected]> Co-authored-by: Pavel Okhlopkov <[email protected]>
1 parent 3eeed3d commit c08b553

File tree

17 files changed

+305
-215
lines changed

17 files changed

+305
-215
lines changed

‎.github/workflows/tests-labeled.yaml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ jobs:
4646
fail-fast: true
4747
matrix:
4848
include:
49-
- k8s_version: "1.23"
50-
kind_node_image: "kindest/node:v1.23.17"
51-
cluster_name: "kube-1-23"
52-
- k8s_version: "1.24"
53-
kind_node_image: "kindest/node:v1.24.15"
54-
cluster_name: "kube-1-24"
55-
- k8s_version: "1.25"
56-
kind_node_image: "kindest/node:v1.25.11"
57-
cluster_name: "kube-1-25"
58-
- k8s_version: "1.26"
59-
kind_node_image: "kindest/node:v1.26.6"
60-
cluster_name: "kube-1-26"
61-
- k8s_version: "1.27"
62-
kind_node_image: "kindest/node:v1.27.3"
63-
cluster_name: "kube-1-27"
49+
- k8s_version: "1.28"
50+
kind_node_image: "kindest/node:v1.28.15"
51+
cluster_name: "kube-1-28"
52+
- k8s_version: "1.29"
53+
kind_node_image: "kindest/node:v1.29.14"
54+
cluster_name: "kube-1-29"
55+
- k8s_version: "1.30"
56+
kind_node_image: "kindest/node:v1.30.10"
57+
cluster_name: "kube-1-30"
58+
- k8s_version: "1.31"
59+
kind_node_image: "kindest/node:v1.31.6"
60+
cluster_name: "kube-1-31"
61+
- k8s_version: "1.32"
62+
kind_node_image: "kindest/node:v1.32.3"
63+
cluster_name: "kube-1-32"
6464
runs-on: ubuntu-latest
6565
steps:
6666
- name: Set up Go 1.23
@@ -89,15 +89,15 @@ jobs:
8989
9090
- name: Install ginkgo
9191
run: |
92-
go install github.com/onsi/ginkgo/ginkgo
92+
go install github.com/onsi/ginkgo/v2/ginkgo@latest
9393
echo $PATH
9494
ls -la $GOPATH/bin
9595
ginkgo version
9696
9797
- name: Start kind cluster
9898
uses: engineerd/[email protected]
9999
with:
100-
version: "v0.20.0"
100+
version: "v0.27.0"
101101
image: ${{ matrix.kind_node_image }}
102102
name: ${{ matrix.cluster_name }}
103103

@@ -110,6 +110,5 @@ jobs:
110110
ginkgo \
111111
--tags 'integration test' \
112112
--vet off \
113-
--race \
114113
-p \
115114
-r test/integration

‎Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Prebuilt libjq.
2+
FROM --platform=${TARGETPLATFORM:-linux/amd64} flant/jq:b6be13d5-musl as libjq
3+
14
# Go builder.
25
FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.23-alpine3.21 AS builder
36

@@ -13,8 +16,8 @@ ADD . /app
1316

1417
RUN GOOS=linux \
1518
go build -ldflags="-s -w -X 'github.com/flant/shell-operator/pkg/app.Version=$appVersion'" \
16-
-o shell-operator \
17-
./cmd/shell-operator
19+
-o shell-operator \
20+
./cmd/shell-operator
1821

1922
# Final image
2023
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.21
@@ -27,6 +30,7 @@ RUN apk --no-cache add ca-certificates bash sed tini && \
2730
mkdir /hooks
2831
ADD frameworks/shell /frameworks/shell
2932
ADD shell_lib.sh /
33+
COPY --from=libjq /bin/jq /usr/bin
3034
COPY --from=builder /app/shell-operator /
3135
WORKDIR /
3236
ENV SHELL_OPERATOR_HOOKS_DIR=/hooks

‎go.mod

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ require (
1313
github.com/gofrs/uuid/v5 v5.3.2
1414
github.com/hashicorp/go-multierror v1.1.1
1515
github.com/kennygrant/sanitize v1.2.4
16-
github.com/onsi/ginkgo v1.16.5
1716
github.com/onsi/gomega v1.37.0
1817
github.com/pkg/errors v0.9.1
1918
github.com/prometheus/client_golang v1.20.5
@@ -37,6 +36,7 @@ require (
3736
github.com/gojuno/minimock/v3 v3.4.5
3837
github.com/itchyny/gojq v0.12.17
3938
github.com/muesli/termenv v0.16.0
39+
github.com/onsi/ginkgo/v2 v2.23.4
4040
)
4141

4242
require (
@@ -46,19 +46,12 @@ require (
4646
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
4747
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
4848
github.com/beorn7/perks v1.0.1 // indirect
49-
github.com/caarlos0/env/v11 v11.2.2 // indirect
5049
github.com/cespare/xxhash/v2 v2.3.0 // indirect
51-
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
5250
github.com/davecgh/go-spew v1.1.1 // indirect
53-
github.com/docker/cli v24.0.0+incompatible // indirect
54-
github.com/docker/distribution v2.8.2+incompatible // indirect
55-
github.com/docker/docker v25.0.6+incompatible // indirect
56-
github.com/docker/docker-credential-helpers v0.7.0 // indirect
5751
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5852
github.com/ettle/strcase v0.2.0 // indirect
5953
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
6054
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
61-
github.com/fsnotify/fsnotify v1.7.0 // indirect
6255
github.com/go-errors/errors v1.4.2 // indirect
6356
github.com/go-logr/logr v1.4.2 // indirect
6457
github.com/go-openapi/analysis v0.19.10 // indirect
@@ -68,21 +61,20 @@ require (
6861
github.com/go-openapi/loads v0.19.5 // indirect
6962
github.com/go-openapi/runtime v0.19.16 // indirect
7063
github.com/go-stack/stack v1.8.0 // indirect
71-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
64+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7265
github.com/gogo/protobuf v1.3.2 // indirect
73-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7466
github.com/golang/protobuf v1.5.4 // indirect
7567
github.com/google/btree v1.0.1 // indirect
7668
github.com/google/gnostic-models v0.6.8 // indirect
7769
github.com/google/go-cmp v0.7.0 // indirect
7870
github.com/google/go-containerregistry v0.17.0 // indirect
7971
github.com/google/gofuzz v1.2.0 // indirect
72+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
8073
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8174
github.com/google/uuid v1.6.0 // indirect
8275
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
8376
github.com/hashicorp/errwrap v1.1.0 // indirect
8477
github.com/imdario/mergo v0.3.16 // indirect
85-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8678
github.com/itchyny/timefmt-go v0.1.6 // indirect
8779
github.com/jonboulle/clockwork v0.4.0 // indirect
8880
github.com/josharian/intern v1.0.0 // indirect
@@ -92,45 +84,35 @@ require (
9284
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
9385
github.com/mailru/easyjson v0.7.7 // indirect
9486
github.com/mattn/go-isatty v0.0.20 // indirect
95-
github.com/mitchellh/go-homedir v1.1.0 // indirect
9687
github.com/mitchellh/mapstructure v1.4.1 // indirect
9788
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9889
github.com/modern-go/reflect2 v1.0.2 // indirect
9990
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
10091
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
101-
github.com/nxadm/tail v1.4.8 // indirect
102-
github.com/opencontainers/go-digest v1.0.0 // indirect
103-
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
10492
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
10593
github.com/pmezard/go-difflib v1.0.0 // indirect
10694
github.com/prometheus/client_model v0.6.1 // indirect
10795
github.com/prometheus/common v0.55.0 // indirect
10896
github.com/prometheus/procfs v0.15.1 // indirect
10997
github.com/rivo/uniseg v0.4.7 // indirect
11098
github.com/sergi/go-diff v1.2.0 // indirect
111-
github.com/sirupsen/logrus v1.9.3 // indirect
112-
github.com/spf13/cobra v1.8.1 // indirect
11399
github.com/spf13/pflag v1.0.5 // indirect
114-
github.com/sylabs/oci-tools v0.7.0 // indirect
115100
github.com/tidwall/gjson v1.14.4 // indirect
116101
github.com/tidwall/match v1.1.1 // indirect
117102
github.com/tidwall/pretty v1.2.0 // indirect
118-
github.com/vbatts/tar-split v0.11.3 // indirect
119103
github.com/xlab/treeprint v1.2.0 // indirect
120104
go.mongodb.org/mongo-driver v1.5.4 // indirect
121105
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
122-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
106+
go.uber.org/automaxprocs v1.6.0 // indirect
123107
golang.org/x/net v0.38.0 // indirect
124108
golang.org/x/oauth2 v0.21.0 // indirect
125109
golang.org/x/sync v0.12.0 // indirect
126-
golang.org/x/sys v0.31.0 // indirect
110+
golang.org/x/sys v0.32.0 // indirect
127111
golang.org/x/term v0.30.0 // indirect
128112
golang.org/x/text v0.23.0 // indirect
129-
golang.org/x/tools v0.30.0 // indirect
130-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
113+
golang.org/x/tools v0.31.0 // indirect
131114
google.golang.org/protobuf v1.36.5 // indirect
132115
gopkg.in/inf.v0 v0.9.1 // indirect
133-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
134116
gopkg.in/yaml.v2 v2.4.0 // indirect
135117
k8s.io/cli-runtime v0.30.11 // indirect
136118
k8s.io/klog/v2 v2.130.1 // indirect

0 commit comments

Comments
 (0)