Skip to content
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
50 changes: 12 additions & 38 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,63 +33,37 @@ jobs:
validate-configs:
runs-on: blacksmith-4vcpu-ubuntu-2404
timeout-minutes: 30
permissions:
contents: read
env:
PGDOG_IMAGE: ghcr.io/pgdogdev/pgdog-enterprise:main-ent

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Checkout pgdog-enterprise
uses: actions/checkout@v4
with:
repository: pgdogdev/pgdog-enterprise
ref: main-ent
path: pgdog-source
token: ${{ secrets.PGDOG_ENTERPRISE_TOKEN }}

- name: Install Helm
uses: azure/setup-helm@v4
with:
version: 'latest'
version: latest

- name: Install yq
uses: mikefarah/yq@master

- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true

- name: Cache Rust dependencies
uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
pgdog-source/target/
key: ${{ runner.os }}-cargo-${{ hashFiles('pgdog-source/**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-

- name: Install CMake 3.31
run: |
sudo apt update && sudo apt install mold -y
sudo apt remove cmake
sudo pip3 install cmake==3.31.6

- name: Build pgdog
run: cargo build --bin pgdog
working-directory: pgdog-source
- name: Pull pgdog image
run: docker pull "$PGDOG_IMAGE"

- name: Validate configs
- name: Validate generated pgdog configs
run: |
set -eo pipefail
for values_file in test/values-*.yaml; do
name=$(basename "$values_file" .yaml | sed 's/values-//')
echo "==> Validating config for $name..."
rm -f /tmp/pgdog.toml
./test/generate-config.sh "$values_file" /tmp/pgdog.toml
./pgdog-source/target/debug/pgdog --config=/tmp/pgdog.toml configcheck
docker run --rm \
-v /tmp/pgdog.toml:/tmp/pgdog.toml:ro \
"$PGDOG_IMAGE" \
/usr/local/bin/pgdog --config=/tmp/pgdog.toml configcheck
done
echo "==> All configs valid!"
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: v1
name: pgdog
version: v0.67
version: v0.68
appVersion: "0.1.44"
59 changes: 0 additions & 59 deletions scripts/schema-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -505,65 +505,6 @@ grafanaRemoteWrite.queueConfig.maxBackoff:
serviceMonitor.enabled:
type: boolean

# --- Gateway labels/scheduling ---
gateway.labels:
type: object
gateway.selectorLabels:
type: object
gateway.nodeSelector:
type: object
gateway.tolerations:
type: array
items:
type: object
gateway.affinity:
type: object
gateway.service.annotations:
type: object

# --- Gateway ---
gateway.enabled:
type: boolean
gateway.connectFromPgdog:
type: boolean
gateway.image.pullPolicy:
enum: ["Always", "IfNotPresent", "Never"]
gateway.image.name:
type: string
gateway.port:
type: integer
minimum: 1
maximum: 65535
gateway.bindAddress:
type: string
gateway.service.type:
enum: ["ClusterIP", "NodePort", "LoadBalancer", "ExternalName"]
gateway.tls.existingSecret:
type: string
gateway.tls.certPath:
type: string
gateway.tls.keyPath:
type: string
gateway.control.url:
type: string
gateway.control.token:
type: string
gateway.stats.activeQueriesInterval:
type: integer
minimum: 0
gateway.stats.pingInterval:
type: integer
minimum: 0
gateway.stats.pushInterval:
type: integer
minimum: 0
gateway.stats.configInterval:
type: integer
minimum: 0
gateway.stats.queryStatsInterval:
type: integer
minimum: 0

# --- Prometheus collector labels/scheduling ---
prometheusCollector.labels:
type: object
Expand Down
26 changes: 0 additions & 26 deletions templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -60,32 +60,6 @@ app.kubernetes.io/component: pgdog
{{- end }}
{{- end }}

{{/*
Common labels for gateway
*/}}
{{- define "pgdog.gateway.labels" -}}
{{- if .Values.gateway.labels }}
{{- toYaml .Values.gateway.labels }}
{{- else -}}
app.kubernetes.io/name: {{ include "pgdog.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: gateway
{{- end }}
{{- end }}

{{/*
Selector labels for gateway
*/}}
{{- define "pgdog.gateway.selectorLabels" -}}
{{- if .Values.gateway.selectorLabels }}
{{- toYaml .Values.gateway.selectorLabels }}
{{- else -}}
app.kubernetes.io/name: {{ include "pgdog.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: gateway
{{- end }}
{{- end }}

{{/*
Common labels for prometheus-collector
*/}}
Expand Down
Loading
Loading