Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
inteon committed Oct 22, 2023
1 parent 8a18dad commit 96731c7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion make/e2e-setup.mk
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ $(BINDIR)/downloaded/pebble-$(PEBBLE_COMMIT).tar.gz: | $(BINDIR)/downloaded
$(call local-image-tar,pebble).dir/pebble: $(BINDIR)/downloaded/pebble-$(PEBBLE_COMMIT).tar.gz | $(NEEDS_GO)
@mkdir -p $(dir $@)
tar xzf $< -C /tmp
cd /tmp/pebble-$(PEBBLE_COMMIT) && GOOS=linux GOARCH=$(CRI_ARCH) CGO_ENABLED=$(CGO_ENABLED) GOMAXPROCS=$(GOBUILDPROCS) $(GOBUILD) $(GOFLAGS) -o $(CURDIR)/$@ ./cmd/pebble
cd /tmp/pebble-$(PEBBLE_COMMIT) && $(GO) mod tidy && GOOS=linux GOARCH=$(CRI_ARCH) CGO_ENABLED=$(CGO_ENABLED) GOMAXPROCS=$(GOBUILDPROCS) $(GOBUILD) $(GOFLAGS) -o $(CURDIR)/$@ ./cmd/pebble

$(call local-image-tar,pebble): $(call local-image-tar,pebble).dir/pebble make/config/pebble/Containerfile.pebble
@$(eval BASE := BASE_IMAGE_controller-linux-$(CRI_ARCH))
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/pki/match_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func TestCertificateVersionedHash(t *testing.T) {
DNSNames: []string{"at", "least", "one"},
},
},
hash: "v001:b32301b6e4140720016",
hash: "v001:7f5ad8827a4cd653808882f776e78bd495499bf6dcab4728f37067be",
},
"should not match if commonName is changed": {
cert: &cmapi.Certificate{
Expand All @@ -73,7 +73,7 @@ func TestCertificateVersionedHash(t *testing.T) {
DNSNames: []string{"at", "least", "one"},
},
},
hash: "v001:fd70680aa2703c5b016",
hash: "v001:ca6e008d15957a3961db67dc76e78bd495499bf6dcab4728f37067be",
},
}

Expand Down

0 comments on commit 96731c7

Please sign in to comment.