Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into namespace-only
Browse files Browse the repository at this point in the history
  • Loading branch information
laozc committed Jan 23, 2021
2 parents 522515d + 2691399 commit 973902d
Show file tree
Hide file tree
Showing 171 changed files with 8,994 additions and 25,186 deletions.
13 changes: 12 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ assignees: ''

---

**Note: Make sure to check out known issues (https://github.com/sparebankenvest/azure-key-vault-to-kubernetes#known-issues) before submitting**
**Note: Make sure to check out known issues (https://akv2k8s.io/troubleshooting/known-issues/) before submitting**

**Components and versions**
Select which component(s) the bug relates to with [X].

[ ] Controller, version: `x.x.x` (docker image tag)
[ ] Env-Injector (webhook), version: `x.x.x` (docker image tag)
[ ] Other

**Describe the bug**
A clear and concise description of what the bug is.
Expand All @@ -21,5 +28,9 @@ A clear and concise description of what you expected to happen.
**Logs**
If applicable, add logs to help explain your problem.

```
paste log here...
```

**Additional context**
Add any other context about the problem here.
17 changes: 17 additions & 0 deletions .github/actions/build/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 'Build'
description: 'Build Go packages'
inputs:
build-make-action:
description: 'Action in makefile to build package'
required: true

runs:
using: "composite"
steps:
- name: Test
run: make test
shell: bash

- name: Build docker image
run: make ${{ inputs.build-make-action }}
shell: bash
21 changes: 21 additions & 0 deletions .github/actions/push/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: 'Push'
description: 'Push containers to Docker registry'
inputs:
push-make-action:
description: 'Action in makefile to push package to docker repo'
required: true
docker-user:
description: 'Username to authenticate with docker repository'
required: true
docker-passw:
description: 'Password to authenticate with docker repository'
required: true

runs:
using: "composite"
steps:
- name: Push images to private repo
run: |
echo "${{ inputs.docker-passw}}" | docker login -u ${{ inputs.docker-user }} --password-stdin dokken.azurecr.io
make ${{ inputs.push-make-action }}
shell: bash
80 changes: 0 additions & 80 deletions .github/workflows/build-push.yaml

This file was deleted.

46 changes: 46 additions & 0 deletions .github/workflows/controller-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Build Controller

on:
push:
branches:
- master
- '*-patch'
paths:
- '.github/workflows/controller-build.yaml'
- '.github/actions/**'
- 'Dockerfile'
- 'Makefile'
- 'go.mod'
- 'go.sum'
- 'cmd/azure-keyvault-controller/**'
- 'pkg/**'
- '!docs/**'
- '!crds/**'

jobs:
build-deploy:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@master

- name: Setup Golang
uses: actions/setup-go@v1
with:
go-version: '1.13.4'

- name: Build
uses: ./.github/actions/build
env:
AKV2K8S_CLIENT_ID: ${{ secrets.INT_TEST_CLIENT_ID }}
AKV2K8S_CLIENT_SECRET: ${{ secrets.INT_TEST_CLIENT_SECRET }}
AKV2K8S_CLIENT_TENANT_ID: ${{ secrets.INT_TEST_TENANT_ID }}
AKV2K8S_AZURE_SUBSCRIPTION: ${{ secrets.INT_TEST_SUBSCRIPTION }}
with:
build-make-action: image-controller

- name: Push
uses: ./.github/actions/push
with:
push-make-action: push-controller
docker-user: ${{ secrets.PRIVATE_REGISTRY_USERNAME }}
docker-passw: ${{ secrets.PRIVATE_REGISTRY_PASSWORD }}
26 changes: 26 additions & 0 deletions .github/workflows/controller-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Release Controller

on:
push:
tags:
- 'controller-[0-9]+.[0-9]+.[0-9]+**'

jobs:
build-deploy:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@master

- name: Version
run: make print-v-controller

- name: Pull images from private repo
run: |
echo "${{ secrets.PRIVATE_REGISTRY_PASSWORD }}" | docker login -u ${{ secrets.PRIVATE_REGISTRY_USERNAME }} --password-stdin dokken.azurecr.io
make pull-controller
- name: Push images to public repo
run: |
echo "${{ secrets.PUBLIC_REGISTRY_PASSWORD }}" | docker login -u ${{ secrets.PUBLIC_REGISTRY_USERNAME }} --password-stdin
make release-controller DOCKER_RELEASE_TAG=${GITHUB_REF##*/}
44 changes: 0 additions & 44 deletions .github/workflows/publish-docs.yaml

This file was deleted.

30 changes: 30 additions & 0 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: pull request

on:
pull_request:
paths:
- '.github/workflows/**'
- 'Makefile'
- 'go.mod'
- 'go.sum'
- 'cmd/**'
- 'pkg/**'
- '!docs/**'
- '!crds/**'

jobs:
build-deploy:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@master

- name: Setup Golang
uses: actions/setup-go@v1
with:
go-version: '1.13.4'

- name: Test
run: make test

- name: Build docker images
run: make build
23 changes: 0 additions & 23 deletions .github/workflows/release.yaml

This file was deleted.

46 changes: 46 additions & 0 deletions .github/workflows/vaultenv-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Build Vault Env

on:
push:
branches:
- master
- '*-patch'
paths:
- '.github/workflows/vaultenv-build.yaml'
- '.github/actions/**'
- 'Dockerfile'
- 'Makefile'
- 'go.mod'
- 'go.sum'
- 'cmd/azure-keyvault-env/**'
- 'pkg/**'
- '!docs/**'
- '!crds/**'

jobs:
build-deploy:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@master

- name: Setup Golang
uses: actions/setup-go@v1
with:
go-version: '1.13.4'

- name: Build
uses: ./.github/actions/build
env:
AKV2K8S_CLIENT_ID: ${{ secrets.INT_TEST_CLIENT_ID }}
AKV2K8S_CLIENT_SECRET: ${{ secrets.INT_TEST_CLIENT_SECRET }}
AKV2K8S_CLIENT_TENANT_ID: ${{ secrets.INT_TEST_TENANT_ID }}
AKV2K8S_AZURE_SUBSCRIPTION: ${{ secrets.INT_TEST_SUBSCRIPTION }}
with:
build-make-action: image-vaultenv

- name: Push
uses: ./.github/actions/push
with:
push-make-action: push-vaultenv
docker-user: ${{ secrets.PRIVATE_REGISTRY_USERNAME }}
docker-passw: ${{ secrets.PRIVATE_REGISTRY_PASSWORD }}
Loading

0 comments on commit 973902d

Please sign in to comment.