Skip to content

Commit 79a3bff

Browse files
michaeljguarinomichaeljguarino
authored
Ensure plural up can handle built-in o11y (#639)
Need to include default helm values files here too
1 parent c451b67 commit 79a3bff

File tree

2 files changed

+78
-77
lines changed

2 files changed

+78
-77
lines changed

‎.github/workflows/goreleaser-cd.yml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -52,83 +52,83 @@ jobs:
5252
GORELEASER_PREVIOUS_TAG: ${{ steps.release.outputs.prev }}
5353

5454
# Publish CLI / Cloud CLI container images
55-
publish:
56-
strategy:
57-
matrix:
58-
image: [ plural-cli, plural-cli-cloud ]
59-
include:
60-
- image: plural-cli
61-
dockerfile: ./Dockerfile
62-
- image: plural-cli-cloud
63-
dockerfile: ./dockerfiles/Dockerfile.cloud
64-
runs-on: ubuntu-latest
65-
needs: release
66-
permissions:
67-
contents: 'read'
68-
id-token: 'write'
69-
packages: 'write'
70-
security-events: write
71-
actions: read
72-
steps:
73-
- name: Checkout
74-
uses: actions/checkout@v3
75-
- name: Setup kubectl
76-
uses: azure/setup-kubectl@v3
77-
- name: Docker meta
78-
id: meta
79-
uses: docker/metadata-action@v4
80-
with:
81-
# list of Docker images to use as base name for tags
82-
images: |
83-
ghcr.io/pluralsh/${{ matrix.image }}
84-
# generate Docker tags based on the following events/attributes
85-
tags: |
86-
type=semver,pattern={{version}}
87-
# - name: Login to plural registry
88-
# uses: docker/login-action@v2
89-
# with:
90-
# registry: dkr.plural.sh
91-
# username: [email protected]
92-
# password: ${{ secrets.PLURAL_ACCESS_TOKEN }}
93-
- name: Login to GHCR
94-
uses: docker/login-action@v2
95-
with:
96-
registry: ghcr.io
97-
username: ${{ github.repository_owner }}
98-
password: ${{ secrets.GITHUB_TOKEN }}
99-
- name: Get current date
100-
id: date
101-
run: echo "date=$(date -u +'%Y-%m-%dT%H:%M:%S%z')" >> $GITHUB_OUTPUT
102-
- name: Set up Docker Buildx
103-
uses: docker/setup-buildx-action@v3
104-
- name: Build and push
105-
uses: docker/build-push-action@v6
106-
with:
107-
context: "."
108-
file: "${{ matrix.dockerfile }}"
109-
push: true
110-
tags: ${{ steps.meta.outputs.tags }}
111-
labels: ${{ steps.meta.outputs.labels }}
112-
platforms: linux/amd64,linux/arm64
113-
build-args: |
114-
APP_VSN=${{ github.ref_name }}
115-
APP_COMMIT=${{ github.sha }}
116-
APP_DATE=${{ steps.date.outputs.date }}
117-
- name: Run Trivy vulnerability scanner on image
118-
uses: aquasecurity/trivy-action@master
119-
with:
120-
scan-type: 'image'
121-
image-ref: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
122-
hide-progress: false
123-
format: 'sarif'
124-
output: 'trivy-results.sarif'
125-
scanners: 'vuln'
126-
timeout: 10m
127-
ignore-unfixed: true
128-
- name: Upload Trivy scan results to GitHub Security tab
129-
uses: github/codeql-action/upload-sarif@v2
130-
with:
131-
sarif_file: 'trivy-results.sarif'
55+
# publish:
56+
# strategy:
57+
# matrix:
58+
# image: [ plural-cli, plural-cli-cloud ]
59+
# include:
60+
# - image: plural-cli
61+
# dockerfile: ./Dockerfile
62+
# - image: plural-cli-cloud
63+
# dockerfile: ./dockerfiles/Dockerfile.cloud
64+
# runs-on: ubuntu-latest
65+
# needs: release
66+
# permissions:
67+
# contents: 'read'
68+
# id-token: 'write'
69+
# packages: 'write'
70+
# security-events: write
71+
# actions: read
72+
# steps:
73+
# - name: Checkout
74+
# uses: actions/checkout@v3
75+
# - name: Setup kubectl
76+
# uses: azure/setup-kubectl@v3
77+
# - name: Docker meta
78+
# id: meta
79+
# uses: docker/metadata-action@v4
80+
# with:
81+
# # list of Docker images to use as base name for tags
82+
# images: |
83+
# ghcr.io/pluralsh/${{ matrix.image }}
84+
# # generate Docker tags based on the following events/attributes
85+
# tags: |
86+
# type=semver,pattern={{version}}
87+
# # - name: Login to plural registry
88+
# # uses: docker/login-action@v2
89+
# # with:
90+
# # registry: dkr.plural.sh
91+
# # username: [email protected]
92+
# # password: ${{ secrets.PLURAL_ACCESS_TOKEN }}
93+
# - name: Login to GHCR
94+
# uses: docker/login-action@v2
95+
# with:
96+
# registry: ghcr.io
97+
# username: ${{ github.repository_owner }}
98+
# password: ${{ secrets.GITHUB_TOKEN }}
99+
# - name: Get current date
100+
# id: date
101+
# run: echo "date=$(date -u +'%Y-%m-%dT%H:%M:%S%z')" >> $GITHUB_OUTPUT
102+
# - name: Set up Docker Buildx
103+
# uses: docker/setup-buildx-action@v3
104+
# - name: Build and push
105+
# uses: docker/build-push-action@v6
106+
# with:
107+
# context: "."
108+
# file: "${{ matrix.dockerfile }}"
109+
# push: true
110+
# tags: ${{ steps.meta.outputs.tags }}
111+
# labels: ${{ steps.meta.outputs.labels }}
112+
# platforms: linux/amd64,linux/arm64
113+
# build-args: |
114+
# APP_VSN=${{ github.ref_name }}
115+
# APP_COMMIT=${{ github.sha }}
116+
# APP_DATE=${{ steps.date.outputs.date }}
117+
# - name: Run Trivy vulnerability scanner on image
118+
# uses: aquasecurity/trivy-action@master
119+
# with:
120+
# scan-type: 'image'
121+
# image-ref: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
122+
# hide-progress: false
123+
# format: 'sarif'
124+
# output: 'trivy-results.sarif'
125+
# scanners: 'vuln'
126+
# timeout: 10m
127+
# ignore-unfixed: true
128+
# - name: Upload Trivy scan results to GitHub Security tab
129+
# uses: github/codeql-action/upload-sarif@v2
130+
# with:
131+
# sarif_file: 'trivy-results.sarif'
132132
# packer:
133133
# name: Build EKS AMI
134134
# runs-on: ubuntu-latest

‎pkg/up/generate.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ func (ctx *Context) Generate(gitRef string) (dir string, err error) {
6969
{from: ctx.path("templates"), to: "templates"},
7070
{from: ctx.path("resources"), to: "resources"},
7171
{from: ctx.path("services"), to: "services"},
72+
{from: ctx.path("helm"), to: "helm"},
7273
}
7374

7475
for _, copy := range copies {

0 commit comments

Comments
 (0)