Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP-24423] update readme, add extra svc names to cloudzero-cert, add cloudzero-cert chart publish #129

Merged
merged 1 commit into from
Jan 3, 2025
Merged

[CP-24423] update readme, add extra svc names to cloudzero-cert, add cloudzero-cert chart publish #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/build-and-publish-beta-chart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:
- name: Install Helm
uses: azure/setup-helm@v3

- name: Build Insights Controller Dependencies
run: helm dependency update charts/cloudzero-insights-controller/
- name: Build cloudzero-certificate Dependencies
run: helm dependency update charts/cloudzero-certificate/

- name: Package Insights Controller Chart
run: helm package charts/cloudzero-insights-controller/ --destination .deploy
- name: Package cloudzero-certificate Chart
run: helm package charts/cloudzero-certificate/ --destination .deploy

- name: Build Cloudzero Agent Dependencies
run: helm dependency update charts/cloudzero-agent/
Expand All @@ -71,10 +71,10 @@ jobs:
VERSION_LINE=$(awk '/version:/ && !done {print NR; done=1}' charts/cloudzero-agent/Chart.yaml)
sed -i ''$VERSION_LINE's/.*/version: ${{ env.NEW_VERSION }}/' charts/cloudzero-agent/Chart.yaml

- name: Update Chart Version for insights-controller
- name: Update Chart Version for cloudzero-certificate
run: |
VERSION_LINE=$(awk '/version:/ && !done {print NR; done=1}' charts/cloudzero-insights-controller/Chart.yaml)
sed -i ''$VERSION_LINE's/.*/version: ${{ env.NEW_VERSION }}/' charts/cloudzero-insights-controller/Chart.yaml
VERSION_LINE=$(awk '/version:/ && !done {print NR; done=1}' charts/cloudzero-certificate/Chart.yaml)
sed -i ''$VERSION_LINE's/.*/version: ${{ env.NEW_VERSION }}/' charts/cloudzero-certificate/Chart.yaml

- name: Validate Release Notes are Present
run: |
Expand All @@ -87,7 +87,7 @@ jobs:
- name: Package Chart
run: |
helm package charts/cloudzero-agent/ --destination .deploy
helm package charts/cloudzero-insights-controller/ --destination .deploy
helm package charts/cloudzero-certificatecontroller/ --destination .deploy

- name: Commit updated Chart.yaml
run: |
Expand All @@ -102,8 +102,8 @@ jobs:
- name: Upload Insight Controller Chart as Artifact
uses: actions/upload-artifact@v4
with:
name: insights-controller-chart
path: .deploy/cloudzero-insights-controller-${{ env.NEW_VERSION }}.tgz
name: cloudzero-certificate
path: .deploy/cloudzero-certificate-${{ env.NEW_VERSION }}.tgz

- name: Upload Cloudzero Agent Chart as Artifact
uses: actions/upload-artifact@v4
Expand All @@ -118,7 +118,7 @@ jobs:

- name: Move release Tarball
run: |
cp .deploy/cloudzero-insights-controller-${{ env.NEW_VERSION }}.tgz ./beta/
cp .deploy/cloudzero-certificate-${{ env.NEW_VERSION }}.tgz ./beta/
cp .deploy/cloudzero-agent-${{ env.NEW_VERSION }}.tgz ./beta/
rm -fr .deploy

Expand Down
2 changes: 1 addition & 1 deletion charts/cloudzero-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ The `cloudzero-certificate` chart, which is maintained in this repo, creates a c
helm repo update

# Install the chart, which creates a Secret with a TLS certificate
helm upgrade --install --namespace <YOUR_NAMESPACE> <YOUR_RELEASE_NAME> cloudzero --set cloudzeroAgentReleaseName=<EXAMPLE_CLOUDZERO_AGENT_RELEASE_NAME>
helm upgrade --install --namespace <YOUR_NAMESPACE> <YOUR_RELEASE_NAME> cloudzero/cloudzero-certificate --set cloudzeroAgentReleaseName=<EXAMPLE_CLOUDZERO_AGENT_RELEASE_NAME>

# Get the CA bundle value by running:
CA_BUNDLE=$(kubectl get secret -n <YOUR_NAMESPACE> <YOUR_RELEASE_NAME>-cloudzero-certificate -o jsonpath='{.data.ca\.crt}')
Expand Down
6 changes: 4 additions & 2 deletions charts/cloudzero-certificate/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ Generate certificate for the webhook server
*/}}
{{- define "cloudzero-certificate.genCerts" -}}
{{- $releaseName := required "`cloudzeroAgentReleaseName` must be supplied. This value should be the name of the cloudzero-agent helm release that will be created" .Values.cloudzeroAgentReleaseName -}}
{{- $dnsName := printf "%s-svc.%s.cluster.local" $releaseName $.Release.Namespace -}}
{{- $dnsName := printf "%s-svc.%s.svc.cluster.local" $releaseName $.Release.Namespace -}}
{{- $dnsNameDefault := printf "%s-webhook-server-svc.%s.svc.cluster.local" $releaseName $.Release.Namespace -}}
{{- $dnsNameShort := printf "%s-webhook-server-svc" $releaseName -}}
{{- $ca := genCA "cloudzero-agent-ca" 365 -}}
{{- $cert := genSignedCert $dnsName nil (list $dnsName) 9999999 $ca -}}
{{- $cert := genSignedCert $dnsName nil (list $dnsName $dnsNameDefault $dnsNameShort) 9999999 $ca -}}
ca.crt: {{ $cert.Cert | b64enc }}
tls.crt: {{ $cert.Cert | b64enc }}
tls.key: {{ $cert.Key | b64enc }}
Expand Down
Loading