Skip to content

Commit

Permalink
feat: minimal working package (#8)
Browse files Browse the repository at this point in the history
## Description

## Related Issue

Fixes #
<!-- or -->
Relates to #

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-package-coder/blob/main/CONTRIBUTING.md#developer-workflow)
followed
  • Loading branch information
zachariahmiller committed Apr 24, 2024
1 parent 0581659 commit f83475f
Show file tree
Hide file tree
Showing 18 changed files with 162 additions and 26 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
zarf-package-*
tmp
zarf-sbom

.cache/
.idea/
build/
Expand Down
14 changes: 14 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"yaml.schemas": {
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/uds.schema.json": [
"uds-bundle.yaml"
],
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/tasks.schema.json": [
"tasks.yaml",
"tasks/**/*.yaml"
],
"https://raw.githubusercontent.com/defenseunicorns/zarf/v0.33.0/zarf.schema.json": [
"zarf.yaml"
]
}
}
40 changes: 40 additions & 0 deletions bundle/uds-bundle.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
kind: UDSBundle
metadata:
name: coder-test
description: A UDS bundle for deploying Coder and it's dependencies on a development cluster
# x-release-please-start-version
version: 2.10.2-uds.0
# x-release-please-end

packages:

- name: dev-namespace
path: ../
ref: 0.1.0

- name: postgres-operator
repository: ghcr.io/defenseunicorns/packages/uds/postgres-operator
ref: 1.10.1-uds.4-upstream
overrides:
postgres-operator:
uds-postgres-config:
variables:
- name: POSTGRESQL
description: "Configure postgres using CRs via the uds-postgres-config chart"
path: postgresql

- name: dev-secrets
path: ../
ref: 0.1.0
exports:
- name: DB_PASSWORD


- name: coder
path: ../
# x-release-please-start-version
ref: 2.10.2-uds.0
# x-release-please-end
imports:
- name: DB_PASSWORD
package: dev-secrets
4 changes: 2 additions & 2 deletions bundle/uds-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ variables:
size: "10Gi"
numberOfInstances: 2
users:
gitlab.gitlab: [] # database owner
coder.coder: [] # database owner
databases:
gitlabdb: coder.coder
coder: coder.coder
version: "13"
ingress:
remoteGenerated: Anywhere
2 changes: 1 addition & 1 deletion chart/templates/coder-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ metadata:
namespace: {{ .Release.Namespace }}
type: Opaque
stringData:
url: "postgres://{{ .Values.postgres.username }}:{{ .Values.postgres.password }}@{{ .Values.postgres.host }}:{{ .Values.postgres.port }}/{{ .Values.postgres.dbName }}{{ .Values.postgres.connectionOptions }}"
url: "postgres://{{ .Values.postgres.username }}:{{ .Values.postgres.password }}@{{ .Values.postgres.host }}:{{ .Values.postgres.port }}/{{ .Values.postgres.dbName }}{{ .Values.postgres.connectionOptions }}"
18 changes: 18 additions & 0 deletions chart/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: v1
kind: Service
metadata:
name: coder
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/instance: coder
app.kubernetes.io/name: coder
spec:
ports:
- name: http
port: 8080
protocol: TCP
targetPort: http
selector:
app.kubernetes.io/instance: coder
app.kubernetes.io/name: coder
type: ClusterIP
8 changes: 4 additions & 4 deletions chart/templates/uds-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ spec:
network:
expose:
- service: coder
podLabels:
selector:
app.kubernetes.io/name: coder
gateway: tenant
host: coder
port: 8065
port: 8080
allow:
# Permit intra-namespace communication for job communications
- direction: Ingress
Expand All @@ -22,6 +22,6 @@ spec:

# Todo: wide open for hitting in-cluster or external postgres/s3
- direction: Egress
podLabels:
selector:
app.kubernetes.io/name: coder
remoteGenerated: Anywhere
remoteGenerated: Anywhere
4 changes: 2 additions & 2 deletions chart/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
postgres:
username: "coder"
username: "coder.coder"
password: ""
host: ""
host: "pg-cluster.postgres.svc.cluster.local"
port: 5432
dbName: "coder"
# Example: "?connect_timeout=10&sslmode=disable"
Expand Down
20 changes: 20 additions & 0 deletions common/zarf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
kind: ZarfPackageConfig
metadata:
name: coder-common
description: "UDS Coder Common Package"

components:
- name: coder
charts:
- name: uds-coder-config
namespace: coder
version: 0.1.0
localPath: ../chart
valuesFiles:
- ../values/config-values.yaml
- name: coder
version: 2.10.2
url: https://helm.coder.com/v2
namespace: coder
valuesFiles:
- ../values/common-values.yaml
16 changes: 16 additions & 0 deletions src/dev-secrets/zarf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
kind: ZarfPackageConfig
metadata:
name: dev-secrets
version: "0.1.0"

components:
- name: postgres-password
required: true
actions:
onDeploy:
before:
- cmd: ./zarf tools kubectl get secret -n coder coder.coder.pg-cluster.credentials.postgresql.acid.zalan.do --template={{.data.password}} | base64 -d
mute: true
setVariables:
- name: DB_PASSWORD
sensitive: true
4 changes: 4 additions & 0 deletions src/namespace/coder-ns.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kind: Namespace
apiVersion: v1
metadata:
name: coder
13 changes: 13 additions & 0 deletions src/namespace/zarf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
kind: ZarfPackageConfig
metadata:
name: dev-namespace
description: "create namespaces for cross-ns secret functionality of pg operator"
version: 0.1.0

components:
- name: deploy-namespace-for-cross-ns-secret
required: true
manifests:
- name: dev-namespace
files:
- coder-ns.yaml
10 changes: 4 additions & 6 deletions tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
includes:
- cleanup: ./tasks/cleanup.yaml
- dependencies: ./tasks/dependencies.yaml
- test: ./tasks/test.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.4.0/tasks/create.yaml
Expand Down Expand Up @@ -44,21 +43,20 @@ tasks:
- name: test-package
description: Test the Coder package from the current branch
actions:
- cmd: echo noop
# - task: create-coder-test-bundle
# - task: setup:k3d-test-cluster
# - task: deploy:test-bundle
- task: create-coder-test-bundle
- task: setup:k3d-test-cluster
- task: deploy:test-bundle
# - task: test:health-check
# - task: test:ingress

- name: test-upgrade
description: Test an upgrade from the latest released package to the current branch
actions:
- cmd: echo noop
# - task: create-coder-latest-release-bundle
# - task: setup:k3d-test-cluster
# - task: deploy:test-bundle
# - task: create-coder-test-bundle
# - task: deploy:test-bundle
# - task: test:health-check
# - task: test:ingress
- cmd: echo "noop"
6 changes: 6 additions & 0 deletions tasks/dependencies.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
tasks:
- name: create
description: Create the Dependency Zarf Packages
actions:
- cmd: ./uds zarf package create src/namespace/ --confirm --no-progress --architecture=${UDS_ARCH}
- cmd: ./uds zarf package create src/dev-secrets/ --confirm --no-progress --architecture=${UDS_ARCH}
6 changes: 3 additions & 3 deletions values/coder.yaml → values/common-values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
coder:
# image:
# tag: v0.1.0
env:
# Disable telemetry
- name: "CODER_TELEMETRY_ENABLE"
Expand All @@ -21,4 +19,6 @@ coder:
name: coder-db-url
key: url
- name: CODER_ACCESS_URL
value: "https://coder.uds.dev"
value: "https://coder.###ZARF_VAR_DOMAIN###"
service:
enable: false
2 changes: 2 additions & 0 deletions values/config-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
postgres:
password: "###ZARF_VAR_DB_PASSWORD###"
4 changes: 4 additions & 0 deletions values/upstream-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
coder:
image:
repo: "ghcr.io/coder/coder"
tag: v2.10.2
14 changes: 9 additions & 5 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,25 @@ kind: ZarfPackageConfig
metadata:
name: coder
description: auto-generated using `zarf dev generate`
version: v2.10.2
version: 2.10.2-uds.0

variables:
- name: DOMAIN
default: "uds.dev"
- name: DB_PASSWORD
description: "Database Password for Coder"


components:
- name: coder
required: true
import:
path: common
only:
flavor: upstream
charts:
- name: coder
version: 2.10.2
url: https://helm.coder.com/v2
namespace: coder
valuesFiles:
- "values/coder.yaml"
- "values/upstream-values.yaml"
images:
- ghcr.io/coder/coder:v2.10.2

0 comments on commit f83475f

Please sign in to comment.