Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Matheus Pimenta
|
13f99fa9a0 | ||
|
Matheus Pimenta
|
dcc7def046 | ||
|
fluxcdbot
|
dcf8165ce5 |
@@ -23,6 +23,8 @@ permissions:
|
||||
jobs:
|
||||
e2e-aks:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
SSH_SECRET_SMOKE_TEST_ONLY: "true"
|
||||
defaults:
|
||||
run:
|
||||
working-directory: ./tests/integration
|
||||
@@ -30,17 +32,72 @@ jobs:
|
||||
steps:
|
||||
- name: CheckoutD
|
||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
- name: Smoke test Git SSH secrets
|
||||
env:
|
||||
GITREPO_SSH_CONTENTS: ${{ secrets.GIT_SSH_IDENTITY }}
|
||||
GITREPO_SSH_PUB_CONTENTS: ${{ secrets.GIT_SSH_IDENTITY_PUB }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
mkdir -p ./build/ssh
|
||||
cat <<EOF > build/ssh/key
|
||||
$GITREPO_SSH_CONTENTS
|
||||
EOF
|
||||
cat <<EOF > build/ssh/key.pub
|
||||
$GITREPO_SSH_PUB_CONTENTS
|
||||
EOF
|
||||
chmod 600 build/ssh/key
|
||||
|
||||
key_lines=$(wc -l < build/ssh/key)
|
||||
pub_lines=$(wc -l < build/ssh/key.pub)
|
||||
echo "private key lines: ${key_lines}"
|
||||
echo "public key lines: ${pub_lines}"
|
||||
|
||||
ssh-keygen -y -f build/ssh/key > build/ssh/derived.pub
|
||||
if ! cmp -s build/ssh/derived.pub build/ssh/key.pub; then
|
||||
echo "::error::derived public key does not match GIT_SSH_IDENTITY_PUB"
|
||||
echo "derived public key fingerprint:"
|
||||
ssh-keygen -lf build/ssh/derived.pub
|
||||
echo "configured public key fingerprint:"
|
||||
ssh-keygen -lf build/ssh/key.pub
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "SSH key fingerprint:"
|
||||
ssh-keygen -lf build/ssh/derived.pub
|
||||
|
||||
set +e
|
||||
ssh_output=$(ssh -i build/ssh/key -o BatchMode=yes -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=build/ssh/known_hosts -T git@ssh.dev.azure.com 2>&1)
|
||||
ssh_status=$?
|
||||
set -e
|
||||
echo "${ssh_output}"
|
||||
|
||||
if echo "${ssh_output}" | grep -q "Shell access is not supported"; then
|
||||
echo "Azure DevOps SSH accepted the key"
|
||||
exit 0
|
||||
fi
|
||||
if echo "${ssh_output}" | grep -Eq "Public key authentication failed|Permission denied"; then
|
||||
echo "::error::Azure DevOps SSH rejected the key"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "::error::unexpected Azure DevOps SSH probe result, exit status ${ssh_status}"
|
||||
exit 1
|
||||
- name: Setup Go
|
||||
if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
|
||||
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
|
||||
with:
|
||||
go-version: 1.26.x
|
||||
cache-dependency-path: tests/integration/go.sum
|
||||
- name: Setup Terraform
|
||||
if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
|
||||
uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e # v4.0.1
|
||||
- name: Setup Flux CLI
|
||||
if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
|
||||
run: make build
|
||||
working-directory: ./
|
||||
- name: Setup SOPS
|
||||
if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
|
||||
run: |
|
||||
mkdir -p $HOME/.local/bin
|
||||
wget -O $HOME/.local/bin/sops https://github.com/mozilla/sops/releases/download/v$SOPS_VER/sops-v$SOPS_VER.linux
|
||||
@@ -48,17 +105,21 @@ jobs:
|
||||
env:
|
||||
SOPS_VER: 3.7.1
|
||||
- name: Authenticate to Azure
|
||||
if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
|
||||
uses: Azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v1.4.6
|
||||
with:
|
||||
creds: '{"clientId":"${{ secrets.ARM_CLIENT_ID }}","clientSecret":"${{ secrets.ARM_CLIENT_SECRET }}","subscriptionId":"${{ secrets.ARM_SUBSCRIPTION_ID }}","tenantId":"${{ secrets.ARM_TENANT_ID }}"}'
|
||||
- name: Set dynamic variables in .env
|
||||
if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
|
||||
run: |
|
||||
cat > .env <<EOF
|
||||
export TF_VAR_tags='{ "environment"="github", "ci"="true", "repo"="flux2", "createdat"="$(date -u +x%Y-%m-%d_%Hh%Mm%Ss)" }'
|
||||
EOF
|
||||
- name: Print .env for dynamic tag value reference
|
||||
if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
|
||||
run: cat .env
|
||||
- name: Run Azure e2e tests
|
||||
if: ${{ env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
|
||||
env:
|
||||
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
|
||||
ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
|
||||
@@ -82,7 +143,7 @@ jobs:
|
||||
export GITREPO_SSH_PUB_PATH=build/ssh/key.pub
|
||||
make test-azure
|
||||
- name: Ensure resource cleanup
|
||||
if: ${{ always() }}
|
||||
if: ${{ always() && env.SSH_SECRET_SMOKE_TEST_ONLY != 'true' }}
|
||||
env:
|
||||
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
|
||||
ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
|
||||
|
||||
@@ -13,11 +13,11 @@ require (
|
||||
github.com/distribution/distribution/v3 v3.1.1
|
||||
github.com/fluxcd/cli-utils v1.2.2
|
||||
github.com/fluxcd/go-git-providers v0.27.0
|
||||
github.com/fluxcd/helm-controller/api v1.6.0
|
||||
github.com/fluxcd/image-automation-controller/api v1.2.0
|
||||
github.com/fluxcd/image-reflector-controller/api v1.2.0
|
||||
github.com/fluxcd/kustomize-controller/api v1.9.0
|
||||
github.com/fluxcd/notification-controller/api v1.9.0
|
||||
github.com/fluxcd/helm-controller/api v1.6.1
|
||||
github.com/fluxcd/image-automation-controller/api v1.2.1
|
||||
github.com/fluxcd/image-reflector-controller/api v1.2.1
|
||||
github.com/fluxcd/kustomize-controller/api v1.9.1
|
||||
github.com/fluxcd/notification-controller/api v1.9.1
|
||||
github.com/fluxcd/pkg/apis/event v0.27.1
|
||||
github.com/fluxcd/pkg/apis/meta v1.30.1
|
||||
github.com/fluxcd/pkg/auth v0.54.1
|
||||
@@ -32,8 +32,8 @@ require (
|
||||
github.com/fluxcd/pkg/ssh v0.25.0
|
||||
github.com/fluxcd/pkg/tar v1.2.0
|
||||
github.com/fluxcd/pkg/version v0.16.0
|
||||
github.com/fluxcd/source-controller/api v1.9.0
|
||||
github.com/fluxcd/source-watcher/api/v2 v2.2.0
|
||||
github.com/fluxcd/source-controller/api v1.9.1
|
||||
github.com/fluxcd/source-watcher/api/v2 v2.2.1
|
||||
github.com/go-git/go-git/v5 v5.19.1
|
||||
github.com/go-logr/logr v1.4.3
|
||||
github.com/gonvenience/bunt v1.4.2
|
||||
|
||||
@@ -176,16 +176,16 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
|
||||
github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
|
||||
github.com/fluxcd/go-git-providers v0.27.0 h1:ll7qL4xYW6JtlcdRCpLYKQPqqXNs3je+J7xyEAF+fgw=
|
||||
github.com/fluxcd/go-git-providers v0.27.0/go.mod h1:l1ODx/sh0/pJ0LM8K3HJHhiMBR9dxaJcNUazT+I7VRM=
|
||||
github.com/fluxcd/helm-controller/api v1.6.0 h1:s0IZ+pA9IyyWc6E6DzOJPvQqunmnqU3W66RimXSYUTY=
|
||||
github.com/fluxcd/helm-controller/api v1.6.0/go.mod h1:oKuRQYGJVS87HLybfpgYbu1X1anigFpRsVLLjPXufTA=
|
||||
github.com/fluxcd/image-automation-controller/api v1.2.0 h1:i9RdeoC6UL8fVrqVyIuVRSC4/KQUyrxSDNF3+ulWeO0=
|
||||
github.com/fluxcd/image-automation-controller/api v1.2.0/go.mod h1:rtuMqaUw1ccENSTeRghZKynpncqLKIYlMYeki2kN3Qc=
|
||||
github.com/fluxcd/image-reflector-controller/api v1.2.0 h1:QayHAgOGx5Z2tkuGM9OKa88dhCKxYfReQu+YZXhq6fE=
|
||||
github.com/fluxcd/image-reflector-controller/api v1.2.0/go.mod h1:5oqi79I6uwr1KSKSjkH2tr4UH8iIsuzISByMJChb8tU=
|
||||
github.com/fluxcd/kustomize-controller/api v1.9.0 h1:thrGRwrUWpEcvVWJd6xxEcIpcOVvre1JCmMY+tl+MF8=
|
||||
github.com/fluxcd/kustomize-controller/api v1.9.0/go.mod h1:/tk2hHcPxglZX/C0zL1NAGN+X+sZTR+JXr5LpzNRSh8=
|
||||
github.com/fluxcd/notification-controller/api v1.9.0 h1:BKz8NEi269rsJj9qU2H1Xz4sdgiKuyWOJHiftrYmyD4=
|
||||
github.com/fluxcd/notification-controller/api v1.9.0/go.mod h1:a5Eyjc/KID4MLiiiMHs40wU5OmV39OHwdCwzeV4PP0Q=
|
||||
github.com/fluxcd/helm-controller/api v1.6.1 h1:h48BXjp/hvN8pIst5KfU++3oyLlO2OpigXfclSj7NW4=
|
||||
github.com/fluxcd/helm-controller/api v1.6.1/go.mod h1:CaI5bHedusLcXYj1+pkd4RkSE8TtiEHI3ReHNsUySbg=
|
||||
github.com/fluxcd/image-automation-controller/api v1.2.1 h1:RgJzncZf/aZpGlySOkqztOoDaQjm0afyFzMC4gTJbjw=
|
||||
github.com/fluxcd/image-automation-controller/api v1.2.1/go.mod h1:LmGIeIsxdrmzJbXpexrRUaBLjJCPrNY3XhaDu6osKQY=
|
||||
github.com/fluxcd/image-reflector-controller/api v1.2.1 h1:MfaLweSrJjR7YTahHKB8xPhx0Iq2KvcNPsboSjYLRGM=
|
||||
github.com/fluxcd/image-reflector-controller/api v1.2.1/go.mod h1:1dZKQPfQdjdCYWOUA2UUYlF9+xhfosfsGgWaNI875Ts=
|
||||
github.com/fluxcd/kustomize-controller/api v1.9.1 h1:QiGAlrjJh8RzderBavB6Z8MoJgzU0SWi0pK3+uYhZSw=
|
||||
github.com/fluxcd/kustomize-controller/api v1.9.1/go.mod h1:utxc483AZDArFeBW5XeD/wiD0+E1oQbPi3b/TZc+v10=
|
||||
github.com/fluxcd/notification-controller/api v1.9.1 h1:XGg9Muj0x/t5wmeqZh/8ZAgTpz4NIylP0wIhNI3cN+M=
|
||||
github.com/fluxcd/notification-controller/api v1.9.1/go.mod h1:TpGuKZjeo2yXXKZ/X3oPIxMm/YGFQkccO31CDeXzrv4=
|
||||
github.com/fluxcd/pkg/apis/acl v0.10.0 h1:KPfAmELNvtvaz8wixnm/MYXqa+MJf7ntVVMUU93Aenk=
|
||||
github.com/fluxcd/pkg/apis/acl v0.10.0/go.mod h1:a87i2A7AlFO5N2J8CxtzaUCCDmuLLWOHwkKu3eJF5fY=
|
||||
github.com/fluxcd/pkg/apis/event v0.27.1 h1:bFnP6gcZzCVm/Dxf/ByFz6BW+FzSn4RoWUkf7ri2bOs=
|
||||
@@ -222,10 +222,10 @@ github.com/fluxcd/pkg/tar v1.2.0 h1:T6WFB5M0YRHktlrgdKNskqpdp76TVDdWTOeuWz33CFs=
|
||||
github.com/fluxcd/pkg/tar v1.2.0/go.mod h1:Wlalp5vIVe+BbckkKkqExKcoHAeeWJPAzwK7ONeFcS0=
|
||||
github.com/fluxcd/pkg/version v0.16.0 h1:VR9+143LAwbyUSAaMhiJHbfsiU+fTjA9L/3dr1ucfrI=
|
||||
github.com/fluxcd/pkg/version v0.16.0/go.mod h1:2M/l90CmbDaD21JTh77hjwaUbd/YM96+Fo8x4fMdxLI=
|
||||
github.com/fluxcd/source-controller/api v1.9.0 h1:kO5elmtCk227YKAfpTY+8Q6rgozOYmeyRRskGZBEbbo=
|
||||
github.com/fluxcd/source-controller/api v1.9.0/go.mod h1:NsJJuEPUYYUJ0u8wMnAqS2T+bXyxOmGrnwdzvZRTiZw=
|
||||
github.com/fluxcd/source-watcher/api/v2 v2.2.0 h1:IsVGDqxeYhY4qyF913gvZ8KnldXZSTuRjAW93Zfc6FE=
|
||||
github.com/fluxcd/source-watcher/api/v2 v2.2.0/go.mod h1:qZHGFA/Sc/yREED37RdsKim3mcpqrzv/qLK+ptbXFfc=
|
||||
github.com/fluxcd/source-controller/api v1.9.1 h1:04Elx6/iFwgNOmrymfetaDfFFBqw5/LfoiTgyeLlrqQ=
|
||||
github.com/fluxcd/source-controller/api v1.9.1/go.mod h1:qO98L20gw0MvLpSPapJKypyxHP7PejmJN5KxWXxDjCA=
|
||||
github.com/fluxcd/source-watcher/api/v2 v2.2.1 h1:eRQnrksg/CylJSBFTHXMUpADRB0B2YC11YaUjSW9ZWE=
|
||||
github.com/fluxcd/source-watcher/api/v2 v2.2.1/go.mod h1:v84ckEC92IRw9HZVHzUamwkgIv1Vh38NQn/jCwo8Sro=
|
||||
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
|
||||
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
|
||||
github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78=
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- https://github.com/fluxcd/helm-controller/releases/download/v1.6.0/helm-controller.crds.yaml
|
||||
- https://github.com/fluxcd/helm-controller/releases/download/v1.6.0/helm-controller.deployment.yaml
|
||||
- https://github.com/fluxcd/helm-controller/releases/download/v1.6.1/helm-controller.crds.yaml
|
||||
- https://github.com/fluxcd/helm-controller/releases/download/v1.6.1/helm-controller.deployment.yaml
|
||||
- account.yaml
|
||||
transformers:
|
||||
- labels.yaml
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.0/image-automation-controller.crds.yaml
|
||||
- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.0/image-automation-controller.deployment.yaml
|
||||
- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.1/image-automation-controller.crds.yaml
|
||||
- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.1/image-automation-controller.deployment.yaml
|
||||
- account.yaml
|
||||
transformers:
|
||||
- labels.yaml
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.0/image-reflector-controller.crds.yaml
|
||||
- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.0/image-reflector-controller.deployment.yaml
|
||||
- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.1/image-reflector-controller.crds.yaml
|
||||
- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.1/image-reflector-controller.deployment.yaml
|
||||
- account.yaml
|
||||
transformers:
|
||||
- labels.yaml
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.0/kustomize-controller.crds.yaml
|
||||
- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.0/kustomize-controller.deployment.yaml
|
||||
- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.1/kustomize-controller.crds.yaml
|
||||
- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.1/kustomize-controller.deployment.yaml
|
||||
- account.yaml
|
||||
transformers:
|
||||
- labels.yaml
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- https://github.com/fluxcd/notification-controller/releases/download/v1.9.0/notification-controller.crds.yaml
|
||||
- https://github.com/fluxcd/notification-controller/releases/download/v1.9.0/notification-controller.deployment.yaml
|
||||
- https://github.com/fluxcd/notification-controller/releases/download/v1.9.1/notification-controller.crds.yaml
|
||||
- https://github.com/fluxcd/notification-controller/releases/download/v1.9.1/notification-controller.deployment.yaml
|
||||
- account.yaml
|
||||
transformers:
|
||||
- labels.yaml
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- https://github.com/fluxcd/source-controller/releases/download/v1.9.0/source-controller.crds.yaml
|
||||
- https://github.com/fluxcd/source-controller/releases/download/v1.9.0/source-controller.deployment.yaml
|
||||
- https://github.com/fluxcd/source-controller/releases/download/v1.9.1/source-controller.crds.yaml
|
||||
- https://github.com/fluxcd/source-controller/releases/download/v1.9.1/source-controller.deployment.yaml
|
||||
- account.yaml
|
||||
transformers:
|
||||
- labels.yaml
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- https://github.com/fluxcd/source-watcher/releases/download/v2.2.0/source-watcher.crds.yaml
|
||||
- https://github.com/fluxcd/source-watcher/releases/download/v2.2.0/source-watcher.deployment.yaml
|
||||
- https://github.com/fluxcd/source-watcher/releases/download/v2.2.1/source-watcher.crds.yaml
|
||||
- https://github.com/fluxcd/source-watcher/releases/download/v2.2.1/source-watcher.deployment.yaml
|
||||
- account.yaml
|
||||
transformers:
|
||||
- labels.yaml
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- https://github.com/fluxcd/source-controller/releases/download/v1.9.0/source-controller.crds.yaml
|
||||
- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.0/kustomize-controller.crds.yaml
|
||||
- https://github.com/fluxcd/helm-controller/releases/download/v1.6.0/helm-controller.crds.yaml
|
||||
- https://github.com/fluxcd/notification-controller/releases/download/v1.9.0/notification-controller.crds.yaml
|
||||
- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.0/image-reflector-controller.crds.yaml
|
||||
- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.0/image-automation-controller.crds.yaml
|
||||
- https://github.com/fluxcd/source-watcher/releases/download/v2.2.0/source-watcher.crds.yaml
|
||||
- https://github.com/fluxcd/source-controller/releases/download/v1.9.1/source-controller.crds.yaml
|
||||
- https://github.com/fluxcd/kustomize-controller/releases/download/v1.9.1/kustomize-controller.crds.yaml
|
||||
- https://github.com/fluxcd/helm-controller/releases/download/v1.6.1/helm-controller.crds.yaml
|
||||
- https://github.com/fluxcd/notification-controller/releases/download/v1.9.1/notification-controller.crds.yaml
|
||||
- https://github.com/fluxcd/image-reflector-controller/releases/download/v1.2.1/image-reflector-controller.crds.yaml
|
||||
- https://github.com/fluxcd/image-automation-controller/releases/download/v1.2.1/image-automation-controller.crds.yaml
|
||||
- https://github.com/fluxcd/source-watcher/releases/download/v2.2.1/source-watcher.crds.yaml
|
||||
|
||||
Reference in New Issue
Block a user