Skip to content

Commit 134ef83

Browse files
bobcallawaybobcallaway
authored
remove trillian images from release process (#1983)
* remove trillian images from release process Signed-off-by: Bob Callaway <[email protected]> * remove references Signed-off-by: Bob Callaway <[email protected]> --------- Signed-off-by: Bob Callaway <[email protected]>
1 parent 63aa08f commit 134ef83

File tree

6 files changed

+8
-426
lines changed

6 files changed

+8
-426
lines changed

‎Makefile‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -157,23 +157,6 @@ ko-local:
157157
--tags $(GIT_VERSION) --tags $(GIT_HASH) --image-refs redisImagerefs \
158158
github.com/sigstore/rekor/cmd/backfill-redis
159159

160-
# This builds the trillian containers we rely on using ko for cross platform support
161-
.PHONY: ko-trillian
162-
ko-trillian:
163-
cd hack/tools \
164-
&& ko publish --base-import-paths \
165-
--platform=all --tags $(GIT_VERSION) --tags $(GIT_HASH) \
166-
--image-refs trillianSignerImagerefs github.com/google/trillian/cmd/trillian_log_signer \
167-
&& mv trillianSignerImagerefs ../.. \
168-
&& cd -
169-
170-
cd hack/tools && \
171-
ko publish --base-import-paths \
172-
--platform=all --tags $(GIT_VERSION) --tags $(GIT_HASH) \
173-
--image-refs trillianServerImagerefs github.com/google/trillian/cmd/trillian_log_server \
174-
&& mv trillianServerImagerefs ../.. \
175-
&& cd -
176-
177160
.PHONY: fuzz
178161
# This runs the fuzz tests for a short period of time to ensure they don't crash.
179162
fuzz:

‎hack/tools/go.mod‎

Lines changed: 3 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,18 @@ go 1.20
55
require (
66
github.com/AdamKorcz/go-fuzz-headers-1 v0.0.0-20230329111138-12e09aba5ebd
77
github.com/go-swagger/go-swagger v0.30.5
8-
github.com/google/trillian v1.6.0
98
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
109
)
1110

1211
require (
13-
bitbucket.org/creachadair/shell v0.0.8 // indirect
14-
cloud.google.com/go v0.111.0 // indirect
15-
cloud.google.com/go/compute v1.23.3 // indirect
16-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
17-
cloud.google.com/go/monitoring v1.16.3 // indirect
18-
cloud.google.com/go/spanner v1.55.0 // indirect
19-
cloud.google.com/go/trace v1.10.4 // indirect
20-
contrib.go.opencensus.io/exporter/stackdriver v0.13.14 // indirect
2112
github.com/Masterminds/goutils v1.1.1 // indirect
2213
github.com/Masterminds/semver/v3 v3.2.0 // indirect
2314
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
2415
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
25-
github.com/aws/aws-sdk-go v1.46.4 // indirect
26-
github.com/beorn7/perks v1.0.1 // indirect
27-
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
28-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
29-
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
30-
github.com/cncf/xds/go v0.0.0-20231016030527-8bd2eac9fb4a // indirect
31-
github.com/cockroachdb/cockroach-go/v2 v2.3.5 // indirect
32-
github.com/coreos/go-semver v0.3.1 // indirect
33-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3416
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
35-
github.com/envoyproxy/go-control-plane v0.11.1 // indirect
36-
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
17+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3718
github.com/felixge/httpsnoop v1.0.4 // indirect
3819
github.com/fsnotify/fsnotify v1.6.0 // indirect
39-
github.com/go-logr/logr v1.4.1 // indirect
40-
github.com/go-logr/stdr v1.2.2 // indirect
4120
github.com/go-openapi/analysis v0.21.4 // indirect
4221
github.com/go-openapi/errors v0.20.4 // indirect
4322
github.com/go-openapi/inflect v0.19.0 // indirect
@@ -49,51 +28,25 @@ require (
4928
github.com/go-openapi/strfmt v0.21.7 // indirect
5029
github.com/go-openapi/swag v0.22.4 // indirect
5130
github.com/go-openapi/validate v0.22.1 // indirect
52-
github.com/go-sql-driver/mysql v1.7.1 // indirect
53-
github.com/gogo/protobuf v1.3.2 // indirect
54-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
55-
github.com/golang/mock v1.6.0 // indirect
56-
github.com/golang/protobuf v1.5.3 // indirect
57-
github.com/google/s2a-go v0.1.7 // indirect
31+
github.com/google/go-cmp v0.6.0 // indirect
5832
github.com/google/uuid v1.5.0 // indirect
59-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
60-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
6133
github.com/gorilla/handlers v1.5.1 // indirect
62-
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
6334
github.com/hashicorp/hcl v1.0.0 // indirect
6435
github.com/huandu/xstrings v1.3.3 // indirect
6536
github.com/imdario/mergo v0.3.16 // indirect
66-
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
67-
github.com/jackc/pgconn v1.14.1 // indirect
68-
github.com/jackc/pgio v1.0.0 // indirect
69-
github.com/jackc/pgpassfile v1.0.0 // indirect
70-
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
71-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
72-
github.com/jackc/pgtype v1.14.0 // indirect
73-
github.com/jackc/pgx/v4 v4.18.1 // indirect
7437
github.com/jessevdk/go-flags v1.5.0 // indirect
75-
github.com/jmespath/go-jmespath v0.4.0 // indirect
7638
github.com/josharian/intern v1.0.0 // indirect
77-
github.com/json-iterator/go v1.1.12 // indirect
7839
github.com/kr/pretty v0.3.1 // indirect
7940
github.com/kr/text v0.2.0 // indirect
80-
github.com/lib/pq v1.10.9 // indirect
8141
github.com/magiconair/properties v1.8.7 // indirect
8242
github.com/mailru/easyjson v0.7.7 // indirect
83-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
8443
github.com/mitchellh/copystructure v1.2.0 // indirect
8544
github.com/mitchellh/mapstructure v1.5.0 // indirect
8645
github.com/mitchellh/reflectwalk v1.0.2 // indirect
87-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
88-
github.com/modern-go/reflect2 v1.0.2 // indirect
8946
github.com/oklog/ulid v1.3.1 // indirect
9047
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
9148
github.com/pkg/errors v0.9.1 // indirect
92-
github.com/prometheus/client_golang v1.18.0 // indirect
93-
github.com/prometheus/client_model v0.5.0 // indirect
94-
github.com/prometheus/common v0.45.0 // indirect
95-
github.com/prometheus/procfs v0.12.0 // indirect
96-
github.com/prometheus/prometheus v0.47.2 // indirect
49+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
9750
github.com/rogpeppe/go-internal v1.10.0 // indirect
9851
github.com/shopspring/decimal v1.3.1 // indirect
9952
github.com/spf13/afero v1.9.5 // indirect
@@ -103,38 +56,14 @@ require (
10356
github.com/spf13/viper v1.16.0 // indirect
10457
github.com/subosito/gotenv v1.4.2 // indirect
10558
github.com/toqueteos/webbrowser v1.2.0 // indirect
106-
github.com/transparency-dev/merkle v0.0.2 // indirect
107-
go.etcd.io/etcd/api/v3 v3.5.11 // indirect
108-
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
109-
go.etcd.io/etcd/client/v3 v3.5.11 // indirect
11059
go.mongodb.org/mongo-driver v1.12.0 // indirect
111-
go.opencensus.io v0.24.0 // indirect
112-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
113-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
114-
go.opentelemetry.io/otel v1.21.0 // indirect
115-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
116-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
117-
go.uber.org/multierr v1.11.0 // indirect
118-
go.uber.org/zap v1.26.0 // indirect
11960
golang.org/x/crypto v0.18.0 // indirect
12061
golang.org/x/mod v0.14.0 // indirect
121-
golang.org/x/net v0.19.0 // indirect
122-
golang.org/x/oauth2 v0.15.0 // indirect
12362
golang.org/x/sync v0.6.0 // indirect
12463
golang.org/x/sys v0.16.0 // indirect
12564
golang.org/x/text v0.14.0 // indirect
126-
golang.org/x/time v0.5.0 // indirect
12765
golang.org/x/tools v0.16.1 // indirect
128-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
129-
google.golang.org/api v0.155.0 // indirect
130-
google.golang.org/appengine v1.6.8 // indirect
131-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
132-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
133-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
134-
google.golang.org/grpc v1.60.1 // indirect
135-
google.golang.org/protobuf v1.32.0 // indirect
13666
gopkg.in/ini.v1 v1.67.0 // indirect
13767
gopkg.in/yaml.v2 v2.4.0 // indirect
13868
gopkg.in/yaml.v3 v3.0.1 // indirect
139-
k8s.io/klog/v2 v2.120.0 // indirect
14069
)

0 commit comments

Comments
 (0)