-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NODE-4669: Merge tag 'helm-chart-4.2.3' into main
# Conflicts: # .github/workflows/ci.yaml # .github/workflows/depreview.yaml # charts/ingress-nginx/Chart.yaml
- Loading branch information
Showing
133 changed files
with
710 additions
and
26,871 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| name: kubectl plugin | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - "main" | ||
| paths: | ||
| - "cmd/plugin/**" | ||
| tags: | ||
| - "v*" | ||
|
|
||
| jobs: | ||
| release-plugin: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Set up Go | ||
| uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 # v3.2.0 | ||
| with: | ||
| go-version: 1.18 | ||
|
|
||
| - name: Run GoReleaser | ||
| uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef # v3.0.0 | ||
| with: | ||
| version: latest | ||
| args: release --rm-dist | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Update new version in krew-index | ||
| uses: rajatjindal/krew-release-bot@92da038bbf995803124a8e50ebd438b2f37bbbb0 # v0.0.43 | ||
| with: | ||
| krew_template_file: cmd/plugin/krew.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| # This workflow uses actions that are not certified by GitHub. | ||
| # They are provided by a third-party and are governed by | ||
| # separate terms of service, privacy policy, and support | ||
| # documentation. | ||
|
|
||
| name: Vulnerability Scan | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| release: | ||
| schedule: | ||
| - cron: '00 9 * * 1' | ||
|
|
||
| permissions: | ||
| contents: read | ||
| security-events: write | ||
|
|
||
| jobs: | ||
| version: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| versions: ${{ steps.version.outputs.TAGS }} | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Latest Tag | ||
| id: version | ||
| shell: bash | ||
| run: | | ||
| readarray -t TAGS_ARRAY <<<"$(git tag --list 'controller-v*.*.*' --sort=-version:refname | grep -v 'beta\|alpha')" | ||
| FULL_TAGS=(${TAGS_ARRAY[0]} ${TAGS_ARRAY[1]} ${TAGS_ARRAY[2]}) | ||
| SHORT_TAGS=() | ||
| for i in ${FULL_TAGS[@]} | ||
| do | ||
| echo "tag: $i" | ||
| short=$(echo "$i" | cut -d - -f 2) | ||
| SHORT_TAGS+=($short) | ||
| done | ||
| echo "${SHORT_TAGS[0]},${SHORT_TAGS[1]},${SHORT_TAGS[2]}" | ||
| TAGS_JSON="[\"${SHORT_TAGS[0]}\",\"${SHORT_TAGS[1]}\",\"${SHORT_TAGS[2]}\"]" | ||
| echo "${TAGS_JSON}" | ||
| echo "::set-output name=TAGS::${TAGS_JSON}" | ||
| scan: | ||
| runs-on: ubuntu-latest | ||
| needs: version | ||
| strategy: | ||
| matrix: | ||
| versions: ${{ fromJSON(needs.version.outputs.versions) }} | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b | ||
|
|
||
| - shell: bash | ||
| id: test | ||
| run: echo "Scanning registry.k8s.io/ingress-nginx/controller@${{ matrix.versions }}" | ||
|
|
||
| - name: Scan image with AquaSec/Trivy | ||
| id: scan | ||
| uses: aquasecurity/trivy-action@d63413b0a4a4482237085319f7f4a1ce99a8f2ac #v0.5.1 | ||
| with: | ||
| image-ref: registry.k8s.io/ingress-nginx/controller:${{ matrix.versions }} | ||
| format: 'sarif' | ||
| output: trivy-results-${{ matrix.versions }}.sarif | ||
| exit-code: 0 | ||
| vuln-type: 'os,library' | ||
| severity: 'CRITICAL,HIGH,MEDIUM,LOW,UNKNOWN' | ||
|
|
||
| - name: Output Sarif File | ||
| shell: bash | ||
| run: cat ${{ github.workspace }}/trivy-results-${{ matrix.versions }}.sarif | ||
|
|
||
| # This step checks out a copy of your repository. | ||
| - name: Upload SARIF file | ||
| uses: github/codeql-action/upload-sarif@7fee4ca032ac341c12486c4c06822c5221c76533 | ||
| with: | ||
| token: ${{ github.token }} | ||
| # Path to SARIF file relative to the root of the repository | ||
| sarif_file: ${{ github.workspace }}/trivy-results-${{ matrix.versions }}.sarif | ||
|
|
||
| - name: Vulz Count | ||
| shell: bash | ||
| run: | | ||
| TRIVY_COUNT=$(cat ${{ github.workspace }}/trivy-results-${{ matrix.versions }}.sarif | jq '.runs[0].results | length') | ||
| echo "TRIVY_COUNT: $TRIVY_COUNT" | ||
| echo "Image Vulnerability scan output" >> $GITHUB_STEP_SUMMARY | ||
| echo "Image ID: registry.k8s.io/ingress-nginx/controller@${{ matrix.versions }}" >> $GITHUB_STEP_SUMMARY | ||
| echo "" >> $GITHUB_STEP_SUMMARY | ||
| echo "Trivy Count: $TRIVY_COUNT" >> $GITHUB_STEP_SUMMARY |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| project_name: ingress-nginx | ||
| release: | ||
| github: | ||
| owner: kubernetes | ||
| name: ingress-nginx | ||
| builds: | ||
| - id: ingress-nginx | ||
| goos: | ||
| - darwin | ||
| - linux | ||
| - windows | ||
| goarch: | ||
| - arm64 | ||
| - amd64 | ||
| env: | ||
| - CGO_ENABLED=0 | ||
| - GO111MODULE=on | ||
| main: cmd/plugin/main.go | ||
| binary: kubectl-ingress-nginx | ||
| ldflags: | | ||
| -s -w | ||
| -X k8s.io/ingress-nginx/version.COMMIT={{ .Commit }} | ||
| -X k8s.io/ingress-nginx/version.RELEASE={{ .Tag }} | ||
| archives: | ||
| - id: ingress-nginx | ||
| builds: | ||
| - ingress-nginx | ||
| name_template: "kubectl-{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}" | ||
| format: tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| registry.k8s.io/ingress-nginx/nginx:f0490cbfbf29a7a05caaac29998dde56173ac2bb@sha256:f0d8d32a20f8c1a7c98b504a03b162931d93edd60ecc2c745917a32e9e3e92ad | ||
| registry.k8s.io/ingress-nginx/nginx:9fdbef829c327b95a3c6d6816a301df41bda997f@sha256:46c27294e467f46d0006ad1eb5fd3f7005eb3cbd00dd43be2ed9b02edfc6e828 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.