Skip to content

Commit e640f7d

Browse files
authored
Merge branch 'external-secrets:main' into main
2 parents 659eba2 + 45e2bd3 commit e640f7d

File tree

441 files changed

+34772
-8648
lines changed

Some content is hidden

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

441 files changed

+34772
-8648
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: kind/bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. provide all relevant manifests
16+
2. provide the Kubernetes and ESO version
17+
18+
**Expected behavior**
19+
A clear and concise description of what you expected to happen.
20+
21+
**Screenshots**
22+
If applicable, add screenshots to help explain your problem.
23+
24+
**Additional context**
25+
Add any other context about the problem here.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: Create Release
3+
about: Release template to track the next release
4+
title: Release x.y
5+
labels: area/release
6+
assignees: ''
7+
8+
---
9+
10+
This Issue tracks the next ESO release. Please follow the guideline below. If anything is missing or unclear, please add a comment to this issue so this can be improved after the release.
11+
12+
#### Preparation Tasks
13+
14+
- [ ] ask in `#external-secrets-dev` if we're ready for a release cut-off or if something needs to get urgently in
15+
- [ ] docs: [stability & support page](https://external-secrets.io/main/introduction/stability-support/) is up to date
16+
- [ ] version table
17+
- [ ] Provider Stability and Support table
18+
- [ ] Provider Feature Support table
19+
- [ ] docs: update [roadmap page](https://external-secrets.io/main/contributing/roadmap/)
20+
- [ ] tidy up [Project Board](https://github.com/orgs/external-secrets/projects/2)
21+
- [ ] move issues to next milestone
22+
- [ ] close milestone
23+
24+
#### Release Execution
25+
26+
- [ ] Follow the [Release Process guide](https://external-secrets.io/main/contributing/release/)
27+
28+
#### After Release Tasks
29+
30+
- [ ] Announce release on `#external-secrets` in Slack
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: kind/feature
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/PAUL.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ maintainers:
55
- sebagomez
66
- rodrmartinez
77
- IdanAdar
8+
- shuheiktgw
9+
- skarlso
10+
- rogertuma
811
# Emeritus Approvers
912
- Flydiverny
1013
- silasbw

.github/actions/e2e-managed/action.yml

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,17 @@ runs:
3737
});
3838
return result;
3939
40-
- name: Configure AWS Credentials
41-
uses: aws-actions/configure-aws-credentials@v1
42-
with:
43-
role-to-assume: ${{ env.AWS_OIDC_ROLE_ARN }}
44-
aws-region: ${{ env.AWS_REGION }}
45-
4640
- name: Setup Go
4741
uses: actions/setup-go@v3
4842
with:
49-
go-version: "1.19"
43+
go-version: "1.21"
5044

5145
- name: Find the Go Cache
5246
id: go
5347
shell: bash
5448
run: |
55-
echo "::set-output name=build-cache::$(go env GOCACHE)"
56-
echo "::set-output name=mod-cache::$(go env GOMODCACHE)"
49+
echo "build-cache=$(go env GOCACHE)" >> $GITHUB_OUTPUT
50+
echo "mod-cache=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
5751
5852
- name: Cache the Go Build Cache
5953
uses: actions/cache@v3
@@ -78,6 +72,13 @@ runs:
7872
shell: bash
7973
run: find ${{ github.workspace }} | grep tf$ | xargs -n1 dirname | xargs -IXXX -n1 /bin/sh -c 'set -o errexit; cd XXX; pwd; tflint --loglevel=info .; cd - >/dev/null'
8074

75+
- name: Configure AWS Credentials
76+
if: env.CLOUD_PROVIDER == 'aws'
77+
uses: aws-actions/configure-aws-credentials@v1
78+
with:
79+
role-to-assume: ${{ env.AWS_OIDC_ROLE_ARN }}
80+
aws-region: ${{ env.AWS_REGION }}
81+
8182
- name: Setup TF Gcloud Provider
8283
shell: bash
8384
if: env.CLOUD_PROVIDER == 'gcp'
@@ -87,16 +88,30 @@ runs:
8788
mkdir -p terraform/gcp/secrets
8889
echo ${GCP_SM_SA_GKE_JSON} > terraform/gcp/secrets/gcloud-service-account-key.json
8990
91+
- name: 'Az CLI login'
92+
uses: azure/login@v1
93+
if: env.CLOUD_PROVIDER == 'azure'
94+
with:
95+
client-id: ${{ env.TFC_AZURE_CLIENT_ID }}
96+
tenant-id: ${{ env.TFC_AZURE_TENANT_ID }}
97+
subscription-id: ${{ env.TFC_AZURE_SUBSCRIPTION_ID }}
98+
9099
- name: Show TF
91100
shell: bash
101+
env:
102+
ARM_CLIENT_ID: "${{ env.TFC_AZURE_CLIENT_ID }}"
103+
ARM_SUBSCRIPTION_ID: "${{ env.TFC_AZURE_SUBSCRIPTION_ID }}"
104+
ARM_TENANT_ID: "${{ env.TFC_AZURE_TENANT_ID }}"
92105
run: |-
93106
PROVIDER=${{env.CLOUD_PROVIDER}}
94107
make tf.show.${PROVIDER}
95108
96109
- name: Apply TF
97110
shell: bash
98111
env:
99-
TF_VAR_OIDC_TOKEN: "${{steps.fetch-token.outputs.result}}"
112+
ARM_CLIENT_ID: "${{ env.TFC_AZURE_CLIENT_ID }}"
113+
ARM_SUBSCRIPTION_ID: "${{ env.TFC_AZURE_SUBSCRIPTION_ID }}"
114+
ARM_TENANT_ID: "${{ env.TFC_AZURE_TENANT_ID }}"
100115
run: |-
101116
PROVIDER=${{env.CLOUD_PROVIDER}}
102117
make tf.apply.${PROVIDER}
@@ -121,6 +136,12 @@ runs:
121136
run: |-
122137
aws --region $AWS_REGION eks update-kubeconfig --name $AWS_CLUSTER_NAME
123138
139+
- name: Get AKS credentials
140+
if: env.CLOUD_PROVIDER == 'azure'
141+
shell: bash
142+
run: |-
143+
az aks get-credentials --admin --name eso-cluster --resource-group external-secrets-operator
144+
124145
- name: Login to Docker
125146
uses: docker/login-action@v2
126147
if: env.GHCR_USERNAME != ''
@@ -137,11 +158,15 @@ runs:
137158
export PATH=$PATH:$(go env GOPATH)/bin
138159
PROVIDER=${{env.CLOUD_PROVIDER}}
139160
go install github.com/onsi/ginkgo/v2/[email protected]
140-
make test.e2e.managed GINKGO_LABELS="${PROVIDER}" TEST_SUITES="provider"
161+
make test.e2e.managed GINKGO_LABELS="${PROVIDER} && managed" TEST_SUITES="provider"
141162
142163
- name: Destroy TF
143164
shell: bash
144165
if: always()
166+
env:
167+
ARM_CLIENT_ID: "${{ env.TFC_AZURE_CLIENT_ID }}"
168+
ARM_SUBSCRIPTION_ID: "${{ env.TFC_AZURE_SUBSCRIPTION_ID }}"
169+
ARM_TENANT_ID: "${{ env.TFC_AZURE_TENANT_ID }}"
145170
run: |-
146171
PROVIDER=${{env.CLOUD_PROVIDER}}
147172
make tf.destroy.${PROVIDER}

.github/actions/e2e/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ runs:
2020
id: go
2121
shell: bash
2222
run: |
23-
echo "::set-output name=build-cache::$(go env GOCACHE)"
24-
echo "::set-output name=mod-cache::$(go env GOMODCACHE)"
23+
echo "build-cache=$(go env GOCACHE)" >> $GITHUB_OUTPUT
24+
echo "mod-cache=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
2525
2626
- name: Cache the Go Build Cache
2727
uses: actions/cache@v3

.github/actions/sign/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ runs:
5757
- name: Get docker image tag
5858
id: container_info
5959
shell: bash
60-
run: echo "::set-output name=digest::$(crane digest ${{ inputs.image-name }}:${{ inputs.image-tag }})"
60+
run: echo "digest=$(crane digest ${{ inputs.image-name }}:${{ inputs.image-tag }})" >> $GITHUB_OUTPUT
6161

6262
- name: Sign image
6363
shell: bash

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "gomod"
4-
directory: "/"
5-
schedule:
6-
interval: "weekly"
73

84
- package-ecosystem: "github-actions"
95
directory: "/"

.github/issue_template.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)