Skip to content

Commit c73c609

Browse files
praveenkumarpraveenkumar
committed
Logic to pull bundle from quay.io
This is initial pr to switch bundle download from mirror to quay.io End user shouldn't affect with this change except there is no download resume functionality. The bundle images are pushed to quay.io/crcont with following name - ocp-<hypervisor>-bundle - podman-<hypervisor>-bundle This PR doesn't remove existing codebase to download bundles from mirror as of now but it should be done in a separate commit so we can easily revert back. ``` $ crc setup [...] INFO Getting bundle for the CRC executable INFO Downloading crc_libvirt_4.10.14_amd64.crcbundle Getting image source signatures Copying blob 7e0dbb47dc47 done Copying config 4f32695e8f done Writing manifest to image destination Storing signatures INFO Extracting the image bundle layer... crc_libvirt_4.10.14_amd64.crcbundle: 3.15 GiB / 3.15 GiB [---------------------------------------------------------------------------------------------------------------------------] 100.00% INFO Uncompressing /home/prkumar/.crc/cache/crc_libvirt_4.10.14_amd64.crcbundle crc.qcow2: 12.61 GiB / 12.61 GiB [---------------------------------------------------------------------------------------------------------------------------------------------------] 100.00% oc: 117.14 MiB / 117.14 MiB [--------------------------------------------------------------------------------------------------------------------------------------------------------] 100.00% ```
1 parent 4425817 commit c73c609

File tree

1,714 files changed

+284772
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,714 files changed

+284772
-14
lines changed

‎Makefile

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ endif
6868

6969
# https://golang.org/cmd/link/
7070
LDFLAGS := $(VERSION_VARIABLES) ${GO_EXTRA_LDFLAGS}
71+
# Same build flags are used in the podman remote to cross build it https://github.com/containers/podman/blob/main/Makefile
72+
BUILDTAGS := remote exclude_graphdriver_btrfs btrfs_noversion exclude_graphdriver_devicemapper containers_image_openpgp
7173

7274
# Add default target
7375
.PHONY: default
@@ -90,19 +92,19 @@ check: cross build_e2e $(HOST_BUILD_DIR)/crc-embedder test cross-lint vendorchec
9092

9193
.PHONY: install
9294
install: $(SOURCES)
93-
go install -ldflags="$(LDFLAGS)" $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
95+
go install -tags "$(BUILDTAGS)" -ldflags="$(LDFLAGS)" $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
9496

9597
$(BUILD_DIR)/macos-amd64/crc: $(SOURCES)
96-
GOARCH=amd64 GOOS=darwin go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/macos-amd64/crc $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
98+
GOARCH=amd64 GOOS=darwin go build -tags "$(BUILDTAGS)" -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/macos-amd64/crc $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
9799

98100
$(BUILD_DIR)/macos-arm64/crc: $(SOURCES)
99-
GOARCH=arm64 GOOS=darwin go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/macos-arm64/crc $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
101+
GOARCH=arm64 GOOS=darwin go build -tags "$(BUILDTAGS)" -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/macos-arm64/crc $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
100102

101103
$(BUILD_DIR)/linux-amd64/crc: $(SOURCES)
102-
GOOS=linux GOARCH=amd64 go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/linux-amd64/crc $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
104+
GOOS=linux GOARCH=amd64 go build -tags "$(BUILDTAGS)" -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/linux-amd64/crc $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
103105

104106
$(BUILD_DIR)/windows-amd64/crc.exe: $(SOURCES)
105-
GOARCH=amd64 GOOS=windows go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/windows-amd64/crc.exe $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
107+
GOARCH=amd64 GOOS=windows go build -tags "$(BUILDTAGS)" -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/windows-amd64/crc.exe $(GO_EXTRA_BUILDFLAGS) ./cmd/crc
106108

107109
$(HOST_BUILD_DIR)/crc-embedder: $(SOURCES)
108110
go build --tags="build" -ldflags="$(LDFLAGS)" -o $(HOST_BUILD_DIR)/crc-embedder $(GO_EXTRA_BUILDFLAGS) ./cmd/crc-embedder
@@ -120,7 +122,7 @@ containerized: clean
120122

121123
.PHONY: test
122124
test:
123-
go test -race --tags build -v -ldflags="$(VERSION_VARIABLES)" ./pkg/... ./cmd/...
125+
go test -race --tags "build $(BUILDTAGS)" -v -ldflags="$(VERSION_VARIABLES)" ./pkg/... ./cmd/...
124126

125127
.PHONY: spec test-rpmbuild
126128

@@ -246,12 +248,12 @@ golangci-lint:
246248
# Run golangci-lint against code
247249
.PHONY: lint cross-lint
248250
lint: golangci-lint
249-
$(TOOLS_BINDIR)/golangci-lint run
251+
$(TOOLS_BINDIR)/golangci-lint run --build-tags "$(BUILDTAGS)"
250252

251253
cross-lint: golangci-lint
252-
GOOS=darwin $(TOOLS_BINDIR)/golangci-lint run
253-
GOOS=linux $(TOOLS_BINDIR)/golangci-lint run
254-
GOOS=windows $(TOOLS_BINDIR)/golangci-lint run
254+
GOOS=darwin $(TOOLS_BINDIR)/golangci-lint run --build-tags "$(BUILDTAGS)"
255+
GOOS=linux $(TOOLS_BINDIR)/golangci-lint run --build-tags "$(BUILDTAGS)"
256+
GOOS=windows $(TOOLS_BINDIR)/golangci-lint run --build-tags "$(BUILDTAGS)"
255257

256258
.PHONY: gen_release_info
257259
gen_release_info:

‎go.mod

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ require (
1616
github.com/code-ready/machine v0.0.0-20210902065103-07b1904d5147
1717
github.com/code-ready/vfkit v0.0.1
1818
github.com/containers/gvisor-tap-vsock v0.3.1-0.20220228052040-b735d4413359
19+
github.com/containers/image/v5 v5.15.0
1920
github.com/coreos/go-systemd/v22 v22.3.2
2021
github.com/cucumber/godog v0.9.0
2122
github.com/cucumber/messages-go/v10 v10.0.3
@@ -31,6 +32,7 @@ require (
3132
github.com/mdlayher/vsock v1.1.1
3233
github.com/onsi/ginkgo v1.16.5
3334
github.com/onsi/gomega v1.19.0
35+
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
3436
github.com/openshift/api v0.0.0-20220124143425-d74727069f6f
3537
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
3638
github.com/openshift/oc v0.0.0-alpha.0.0.20220519063019-878f5a8fe0d0
@@ -63,83 +65,131 @@ require (
6365

6466
require (
6567
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
68+
github.com/BurntSushi/toml v0.3.1 // indirect
69+
github.com/Microsoft/hcsshim v0.8.20 // indirect
6670
github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2 // indirect
6771
github.com/VividCortex/ewma v1.2.0 // indirect
72+
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
6873
github.com/alessio/shellescape v1.4.1 // indirect
6974
github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5 // indirect
7075
github.com/apcera/gssapi v0.0.0-00010101000000-000000000000 // indirect
7176
github.com/apparentlymart/go-cidr v1.1.0 // indirect
72-
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
77+
github.com/beorn7/perks v1.0.1 // indirect
78+
github.com/bits-and-blooms/bitset v1.2.0 // indirect
79+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
80+
github.com/containerd/cgroups v1.0.1 // indirect
81+
github.com/containerd/containerd v1.5.1 // indirect
82+
github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b // indirect
83+
github.com/containers/ocicrypt v1.1.2 // indirect
84+
github.com/containers/storage v1.33.0 // indirect
7385
github.com/cucumber/gherkin-go/v11 v11.0.0 // indirect
7486
github.com/danieljoos/wincred v1.1.2 // indirect
7587
github.com/davecgh/go-spew v1.1.1 // indirect
7688
github.com/dimchansky/utfbom v1.1.1 // indirect
89+
github.com/docker/distribution v2.7.1+incompatible // indirect
7790
github.com/docker/docker v20.10.3+incompatible // indirect
91+
github.com/docker/docker-credential-helpers v0.6.4 // indirect
92+
github.com/docker/go-connections v0.4.0 // indirect
93+
github.com/docker/go-metrics v0.0.1 // indirect
7894
github.com/fatih/color v1.13.0 // indirect
7995
github.com/felixge/httpsnoop v1.0.3 // indirect
8096
github.com/fsnotify/fsnotify v1.5.1 // indirect
97+
github.com/ghodss/yaml v1.0.0 // indirect
8198
github.com/go-logr/logr v1.2.2 // indirect
8299
github.com/go-ole/go-ole v1.2.6 // indirect
83100
github.com/godbus/dbus/v5 v5.1.0 // indirect
84101
github.com/gofrs/uuid v4.2.0+incompatible // indirect
85102
github.com/gogo/protobuf v1.3.2 // indirect
103+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
86104
github.com/golang/protobuf v1.5.2 // indirect
87105
github.com/goodhosts/hostsfile v0.1.1 // indirect
88106
github.com/google/btree v1.0.1 // indirect
89107
github.com/google/go-cmp v0.5.7 // indirect
108+
github.com/google/go-intervals v0.0.2 // indirect
90109
github.com/google/gofuzz v1.2.0 // indirect
91110
github.com/google/gopacket v1.1.19 // indirect
92111
github.com/google/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 // indirect
93112
github.com/google/uuid v1.3.0 // indirect
94113
github.com/googleapis/gnostic v0.5.5 // indirect
114+
github.com/gorilla/mux v1.8.0 // indirect
115+
github.com/hashicorp/errwrap v1.0.0 // indirect
116+
github.com/hashicorp/go-multierror v1.1.1 // indirect
95117
github.com/hashicorp/hcl v1.0.0 // indirect
96118
github.com/imdario/mergo v0.3.12 // indirect
97119
github.com/inconshreveable/mousetrap v1.0.0 // indirect
98120
github.com/insomniacslk/dhcp v0.0.0-20210812084645-decc701b3665 // indirect
99121
github.com/json-iterator/go v1.1.12 // indirect
100122
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
123+
github.com/klauspost/pgzip v1.2.5 // indirect
101124
github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3 // indirect
102125
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
103126
github.com/magiconair/properties v1.8.6 // indirect
104127
github.com/mattn/go-isatty v0.0.14 // indirect
105128
github.com/mattn/go-runewidth v0.0.13 // indirect
129+
github.com/mattn/go-shellwords v1.0.12 // indirect
130+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
106131
github.com/mdlayher/socket v0.2.3 // indirect
107132
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
108133
github.com/miekg/dns v1.1.46 // indirect
134+
github.com/miekg/pkcs11 v1.0.3 // indirect
135+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
109136
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
110137
github.com/mitchellh/mapstructure v1.4.3 // indirect
111138
github.com/moby/spdystream v0.2.0 // indirect
139+
github.com/moby/sys/mountinfo v0.4.1 // indirect
112140
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
113141
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
114142
github.com/modern-go/reflect2 v1.0.2 // indirect
143+
github.com/mtrmac/gpgme v0.1.2 // indirect
115144
github.com/nxadm/tail v1.4.8 // indirect
145+
github.com/opencontainers/go-digest v1.0.0 // indirect
146+
github.com/opencontainers/runc v1.0.1 // indirect
147+
github.com/opencontainers/runtime-spec v1.0.3-0.20211123151946-c2389c3cb60a // indirect
148+
github.com/opencontainers/selinux v1.8.2 // indirect
116149
github.com/openshift/library-go v0.0.0-20220211142501-9f57c596fd46 // indirect
117150
github.com/openstandia/w32uiautomation v0.0.0-20190416091226-c987b5b65d6b // indirect
151+
github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 // indirect
118152
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
119153
github.com/pelletier/go-toml v1.9.4 // indirect
120154
github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
121155
github.com/pmezard/go-difflib v1.0.0 // indirect
122156
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
157+
github.com/prometheus/client_golang v1.11.0 // indirect
158+
github.com/prometheus/client_model v0.2.0 // indirect
159+
github.com/prometheus/common v0.28.0 // indirect
160+
github.com/prometheus/procfs v0.6.0 // indirect
123161
github.com/rivo/uniseg v0.2.0 // indirect
124162
github.com/rogpeppe/go-internal v1.8.0 // indirect
125163
github.com/segmentio/backo-go v1.0.0 // indirect
126164
github.com/spf13/afero v1.8.2 // indirect
127165
github.com/spf13/jwalterweatherman v1.1.0 // indirect
166+
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
128167
github.com/stretchr/objx v0.4.0 // indirect
129168
github.com/subosito/gotenv v1.2.0 // indirect
169+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
170+
github.com/tchap/go-patricia v2.3.0+incompatible // indirect
130171
github.com/tklauser/go-sysconf v0.3.10 // indirect
131172
github.com/tklauser/numcpus v0.4.0 // indirect
132173
github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect
174+
github.com/ulikunitz/xz v0.5.10 // indirect
175+
github.com/vbatts/tar-split v0.11.1 // indirect
176+
github.com/vbauerster/mpb/v7 v7.0.3 // indirect
177+
go.etcd.io/bbolt v1.3.6 // indirect
178+
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect
179+
go.opencensus.io v0.23.0 // indirect
133180
golang.org/x/mod v0.5.0 // indirect
134181
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
135182
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
136183
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
137184
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
138185
google.golang.org/appengine v1.6.7 // indirect
186+
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
187+
google.golang.org/grpc v1.45.0 // indirect
139188
google.golang.org/protobuf v1.28.0 // indirect
140189
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
141190
gopkg.in/inf.v0 v0.9.1 // indirect
142191
gopkg.in/ini.v1 v1.66.4 // indirect
192+
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
143193
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
144194
gopkg.in/yaml.v2 v2.4.0 // indirect
145195
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)