mirror of
https://github.com/external-secrets/external-secrets.git
synced 2024-12-14 11:57:59 +00:00
fix: build a second image to fix the flux managed and unmanaged test (#3931)
* testing no fork e2e run Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> * adding a login step to check if it is required Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> * changing the other github action instead Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> * using a different approach and log in in this action instead of the callling one Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> * adding an input instead Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> * add bitwarden as a hard dependency Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> * trying to add the whole chart to avoid dep update Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> * remove bitwarden chart and build both domains for e2e tests Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com> --------- Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
This commit is contained in:
parent
0924819197
commit
3c2246b6f1
5 changed files with 17 additions and 10 deletions
1
.github/actions/e2e/action.yml
vendored
1
.github/actions/e2e/action.yml
vendored
|
@ -58,7 +58,6 @@ runs:
|
|||
go version
|
||||
ginkgo version
|
||||
cd e2e && go mod tidy && git status && git diff
|
||||
|
||||
- name: Run e2e Tests
|
||||
shell: bash
|
||||
env:
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
<img src="assets/eso-logo-large.png" width="30%" align="center" alt="external-secrets">
|
||||
</p>
|
||||
|
||||
|
||||
# External Secrets
|
||||
|
||||
![ci](https://github.com/external-secrets/external-secrets/actions/workflows/ci.yml/badge.svg?branch=main)
|
||||
|
|
|
@ -3,4 +3,4 @@ dependencies:
|
|||
repository: oci://ghcr.io/external-secrets/charts
|
||||
version: v0.3.1
|
||||
digest: sha256:2d01e9083fc32c18dca4f9614625e0172e338a663138c2670e5b911645b6b8ee
|
||||
generated: "2024-08-29T06:56:01.838539+02:00"
|
||||
generated: "2024-09-20T12:57:07.63511+02:00"
|
||||
|
|
|
@ -4,7 +4,7 @@ should match snapshot of default values:
|
|||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.16.2
|
||||
controller-gen.kubebuilder.io/version: v0.16.3
|
||||
labels:
|
||||
external-secrets.io/component: controller
|
||||
name: secretstores.external-secrets.io
|
||||
|
|
21
e2e/Makefile
21
e2e/Makefile
|
@ -9,12 +9,7 @@ export E2E_IMAGE_NAME ?= ghcr.io/external-secrets/external-secrets-e2e
|
|||
export GINKGO_LABELS ?= !managed
|
||||
export TEST_SUITES ?= provider generator flux argocd
|
||||
|
||||
# Image registry for build/push image targets
|
||||
# Overwrite what is being set in the main Makeilfe because
|
||||
# this is what the Helm chart is using.
|
||||
export IMAGE_REGISTRY = oci.external-secrets.io
|
||||
export IMAGE_REPO = external-secrets/external-secrets
|
||||
export IMAGE_NAME = $(IMAGE_REGISTRY)/$(IMAGE_REPO)
|
||||
export OCI_IMAGE_NAME = oci.external-secrets.io/external-secrets/external-secrets
|
||||
|
||||
start-kind: ## Start kind cluster
|
||||
kind create cluster \
|
||||
|
@ -29,7 +24,13 @@ test: e2e-image ## Run e2e tests against current kube context
|
|||
VERSION=$(VERSION) \
|
||||
ARCH=amd64 \
|
||||
DOCKER_BUILD_ARGS="${DOCKER_BUILD_ARGS} --build-arg TARGETARCH=amd64 --build-arg TARGETOS=linux"
|
||||
$(MAKE) -C ../ docker.build \
|
||||
IMAGE_NAME=$(OCI_IMAGE_NAME) \
|
||||
VERSION=$(VERSION) \
|
||||
ARCH=amd64 \
|
||||
DOCKER_BUILD_ARGS="${DOCKER_BUILD_ARGS} --build-arg TARGETARCH=amd64 --build-arg TARGETOS=linux"
|
||||
kind load docker-image --name="external-secrets" $(IMAGE_NAME):$(VERSION)
|
||||
kind load docker-image --name="external-secrets" $(OCI_IMAGE_NAME):$(VERSION)
|
||||
kind load docker-image --name="external-secrets" $(E2E_IMAGE_NAME):$(VERSION)
|
||||
./run.sh
|
||||
|
||||
|
@ -38,8 +39,16 @@ test.managed: e2e-image ## Run e2e tests against current kube context
|
|||
VERSION=$(VERSION) \
|
||||
ARCH=amd64 \
|
||||
DOCKER_BUILD_ARGS="${DOCKER_BUILD_ARGS} --build-arg TARGETARCH=amd64 --build-arg TARGETOS=linux"
|
||||
$(MAKE) -C ../ docker.build \
|
||||
IMAGE_NAME=$(OCI_IMAGE_NAME) \
|
||||
VERSION=$(VERSION) \
|
||||
ARCH=amd64 \
|
||||
DOCKER_BUILD_ARGS="${DOCKER_BUILD_ARGS} --build-arg TARGETARCH=amd64 --build-arg TARGETOS=linux"
|
||||
$(MAKE) -C ../ docker.push \
|
||||
VERSION=$(VERSION)
|
||||
$(MAKE) -C ../ docker.push \
|
||||
IMAGE_NAME=$(OCI_IMAGE_NAME) \
|
||||
VERSION=$(VERSION)
|
||||
$(MAKE) -C ../ docker.push \
|
||||
IMAGE_NAME=$(E2E_IMAGE_NAME) \
|
||||
VERSION=$(VERSION)
|
||||
|
|
Loading…
Reference in a new issue