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.

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

chore: add uds package CR #15

Merged
merged 5 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ runs:
uses: defenseunicorns/setup-zarf@main
with:
# renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
version: v0.31.1
version: v0.32.1
download-init-package: true

- name: Use Node.js latest
Expand All @@ -27,4 +27,4 @@ runs:
- name: Install UDS CLI
shell: bash
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
run: brew install defenseunicorns/tap/uds@0.5.2
run: brew install defenseunicorns/tap/uds@0.6.1
23 changes: 23 additions & 0 deletions chart/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
18 changes: 18 additions & 0 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: v2
name: chart
description: uds-sonarqube-config

# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.0
20 changes: 20 additions & 0 deletions chart/templates/uds-package.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apiVersion: uds.dev/v1alpha1
kind: Package
metadata:
name: sonarqube
namespace: {{ .Release.Namespace }}
spec:
network:
expose:
- service: sonarqube-sonarqube
podLabels:
app: sonarqube
gateway: tenant
host: sonarqube
port: 9000
allow:
# Todo: wide open for hitting in-cluster or external postgres
- direction: Egress
podLabels:
app: sonarqube
remoteGenerated: Anywhere
Empty file added chart/values.yaml
Empty file.
6 changes: 5 additions & 1 deletion tasks/create.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
variables:
- name: FLAVOR
default: "registry1"

tasks:
- name: sonarqube-test-bundle
description: Create the UDS bundle with Sonarqube and its dependencies
Expand All @@ -9,7 +13,7 @@ tasks:
- name: sonarqube-package
description: Create the UDS Sonarqube Zarf Package
actions:
- cmd: zarf package create --confirm --no-progress --architecture=${ZARF_ARCHITECTURE} --flavor registry1
- cmd: zarf package create --confirm --no-progress --architecture=${ZARF_ARCHITECTURE} --flavor ${FLAVOR}

- name: dependency-package
description: Create the Dependency Zarf Package(s)
Expand Down
2 changes: 1 addition & 1 deletion tasks/setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ tasks:
- name: k3d-test-cluster
actions:
- description: Create k3d cluster with UDS Core
cmd: uds deploy oci://defenseunicorns/uds/bundles/k3d-core-istio:0.7.0-${UDS_ARCH} --confirm --no-progress
cmd: uds deploy oci://defenseunicorns/uds/bundles/k3d-core-istio:0.8.0-${UDS_ARCH} --confirm --no-progress
5 changes: 0 additions & 5 deletions values/sonarqube-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,5 @@ postgresql:
postgresqlDatabase: ###ZARF_VAR_SONARQUBE_DB_NAME###
service:
port: 5432

service:
labels:
uds/istio-gateway: tenant
uds/istio-host: sonarqube

domain: ###ZARF_VAR_DOMAIN###
8 changes: 8 additions & 0 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ components:
version: "8.0.3-bb.0"
valuesFiles:
- values/sonarqube-values.yaml
- name: uds-sonarqube-config
namespace: sonarqube
version: 0.1.0
localPath: chart
images:
- "registry1.dso.mil/ironbank/big-bang/base:2.1.0"
- "registry1.dso.mil/ironbank/big-bang/sonarqube-9:9.9.3-community"
Expand All @@ -77,6 +81,10 @@ components:
- values/sonarqube-values.yaml
- values/upstream.yaml
- values/ce.yaml
- name: uds-sonarqube-config
namespace: sonarqube
version: 0.1.0
localPath: chart
images:
- "sonarqube:9.9.3-community"
- "curlimages/curl:7.76.1"
Expand Down