Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/submodules/bicep-types-0143e0b
Browse files Browse the repository at this point in the history
  • Loading branch information
brooke-hamilton authored Jan 22, 2025
2 parents b7daac4 + 16660a5 commit 86ee4a3
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 336 deletions.
22 changes: 2 additions & 20 deletions .github/workflows/functional-test-noncloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest-m]
os: [ubuntu-latest]
name:
[
cli-noncloud,
Expand Down Expand Up @@ -179,25 +179,7 @@ jobs:
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVER }}
cache: false

- name: Get Go Cache path
id: go-cache-paths
run: |
echo "go-build=$(go env GOCACHE)" >> $GITHUB_OUTPUT
sudo rm -rf $(go env GOCACHE)
echo "go-mod=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
sudo rm -rf $(go env GOMODCACHE)
- uses: actions/cache@v4
with:
path: |
${{ steps.go-cache-paths.outputs.go-build }}
${{ steps.go-cache-paths.outputs.go-mod }}
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
cache: true

- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
13 changes: 13 additions & 0 deletions deploy/Chart/templates/database/configmaps.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: database-secret
namespace: "{{ .Release.Namespace }}"
labels:
control-plane: database
app.kubernetes.io/name: database
app.kubernetes.io/part-of: radius
data:
POSTGRES_DB: ps_db
POSTGRES_USER: ps_user
POSTGRES_PASSWORD: SecurePassword
16 changes: 16 additions & 0 deletions deploy/Chart/templates/database/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: v1
kind: Service
metadata:
name: database
namespace: "{{ .Release.Namespace }}"
labels:
app.kubernetes.io/name: database
app.kubernetes.io/part-of: radius
spec:
ports:
- port: 5432
name: postgres
protocol: TCP
targetPort: 5432
selector:
app.kubernetes.io/name: database
8 changes: 8 additions & 0 deletions deploy/Chart/templates/database/serviceaccount.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: database
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: database
app.kubernetes.io/part-of: radius
56 changes: 56 additions & 0 deletions deploy/Chart/templates/database/statefulset.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: database
namespace: "{{ .Release.Namespace }}"
labels:
control-plane: database
app.kubernetes.io/name: database
app.kubernetes.io/part-of: radius
spec:
serviceName: "database"
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: database
template:
metadata:
labels:
control-plane: database
app.kubernetes.io/name: database
app.kubernetes.io/part-of: radius
spec:
serviceAccountName: database
containers:
- name: database
securityContext:
allowPrivilegeEscalation: false
image: "{{ .Values.database.image }}:{{ .Values.database.tag }}"
imagePullPolicy: IfNotPresent
resources:
requests:
memory: "{{ .Values.database.resources.requests.memory }}"
cpu: "{{ .Values.database.resources.requests.cpu }}"
limits:
memory: "{{ .Values.database.resources.limits.memory }}"
cpu: "{{ .Values.database.resources.limits.cpu }}"
envFrom:
- configMapRef:
name: database-secret
ports:
- containerPort: 5432
name: postgres
volumeMounts:
- name: database
mountPath: /var/lib/postgresql/data
subPath: postgres

volumeClaimTemplates:
- metadata:
name: database
spec:
accessModes: ["ReadWriteOnce"]
storageClassName: {{ .Values.database.storageClassName }}
resources:
requests:
storage: {{ .Values.database.storageSize }}
14 changes: 14 additions & 0 deletions deploy/Chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,17 @@ dashboard:
memory: "60Mi"
limits:
memory: "300Mi"

database:
image: ghcr.io/radius-project/mirror/postgres
tag: latest
storageClassName: "" # set to the storage class name if required
# Minimum resource requirements, may need to revisit and scale.
storageSize: "1Gi"
resources:
requests:
cpu: "2"
memory: "512Mi"
limits:
cpu: "2"
memory: "1024Mi"
118 changes: 0 additions & 118 deletions test/functional-portable/datastoresrp/noncloud/resources/sql_test.go

This file was deleted.

This file was deleted.

Loading

0 comments on commit 86ee4a3

Please sign in to comment.