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

Handle removal of PodMonitor for the CNPG and AppServices pods #1089

Merged
merged 3 commits into from
Dec 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
14 changes: 7 additions & 7 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.github/** @nhudson @ianstanton @shahadarsh @vrmiguel
charts/** @nhudson @ianstanton @shahadarsh
dataplane-webserver/** @nhudson @ianstanton @vrmiguel
tembo-operator/** @nhudson @ianstanton @ChuckHend @vrmiguel
conductor/** @nhudson @ianstanton @ChuckHend @vrmiguel
tembo-pod-init/** @nhudson @ianstanton
tembo-cli/** @shahadarsh @vrmiguel @DarrenBaldwin07 @joshuajerin
.github/** @nhudson @ChuckHend @vrmiguel
charts/** @nhudson @vrmiguel @ChuckHend
dataplane-webserver/** @nhudson @ChuckHend @vrmiguel
tembo-operator/** @nhudson @ChuckHend @vrmiguel
conductor/** @nhudson @ChuckHend @vrmiguel
tembo-pod-init/** @nhudson @vrmiguel @ChuckHend
tembo-cli/** @nhudson @vrmiguel @DarrenBaldwin07
6 changes: 3 additions & 3 deletions charts/tembo-operator/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: cloudnative-pg
repository: https://cloudnative-pg.github.io/charts
version: 0.21.6
digest: sha256:3922d990e9dec07c6dda1f7b8799e9cfd2ef28450357f5a3f260a3d4773e5db2
generated: "2024-09-04T09:47:10.610286988-05:00"
version: 0.22.1
digest: sha256:3154534b59a8f8aa31308f2c3a13358241708a677a46f9012d19f69425ce882f
generated: "2024-12-19T14:42:05.362791735-06:00"
2 changes: 1 addition & 1 deletion charts/tembo-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ maintainers:
url: https://tembocommunity.slack.com
dependencies:
- name: cloudnative-pg
version: 0.21.6
version: 0.22.1
repository: https://cloudnative-pg.github.io/charts
condition: cloudnative-pg.enabled
Binary file not shown.
Binary file not shown.
4 changes: 3 additions & 1 deletion charts/tembo-operator/templates/crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ spec:
description: |-
Generate the Kubernetes wrapper struct `CoreDB` from our Spec and Status struct

This provides a hook for generating the CRD yaml (in crdgen.rs) CoreDBSpec represents the specification for a CoreDB instance. It defines various configuration options for deploying and managing the database. with the tembo-controller
This provides a hook for generating the CRD yaml (in crdgen.rs)

CoreDBSpec represents the specification for a CoreDB instance. It defines various configuration options for deploying and managing the database. with the tembo-controller

# Basic CoreDB Configuration

Expand Down
45 changes: 43 additions & 2 deletions tembo-operator/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion tembo-operator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "controller"
description = "Tembo Operator for Postgres"
version = "0.52.1"
version = "0.53.0"
edition = "2021"
default-run = "controller"
license = "Apache-2.0"
Expand Down Expand Up @@ -68,6 +68,7 @@ rand = "0.8.5"
tower-test = "0.4.0"
futures-util = "0.3"
regex = "1"
serial_test = "3"

[dependencies.kube]
features = ["runtime", "client", "derive", "ws"]
Expand Down
4 changes: 2 additions & 2 deletions tembo-operator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# This does not build on ARM laptops, even with the --platform flag.

FROM --platform=linux/amd64 quay.io/tembo/muslrust:1.77.0-stable AS builder
FROM quay.io/tembo/muslrust:1.82.0-stable AS builder

WORKDIR /build

COPY . .

RUN cargo build --release --target=x86_64-unknown-linux-musl

FROM --platform=linux/amd64 quay.io/tembo/alpine:3.18.2
FROM quay.io/tembo/alpine:3.21.0

RUN adduser -D nonroot

Expand Down
2 changes: 1 addition & 1 deletion tembo-operator/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ORG := "localhost:5001"
VERSION := `git rev-parse HEAD`
SEMVER_VERSION := `grep version Cargo.toml | awk -F"\"" '{print $2}' | head -n 1`
NAMESPACE := "default"
KUBE_VERSION := env_var_or_default('KUBE_VERSION', '1.25.8')
KUBE_VERSION := env_var_or_default('KUBE_VERSION', '1.29.8')
STORAGE_CLASS_NAME := "standard"

default:
Expand Down
2 changes: 1 addition & 1 deletion tembo-operator/src/apis/coredb_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ impl DedicatedNetworking {
/// Generate the Kubernetes wrapper struct `CoreDB` from our Spec and Status struct
///
/// This provides a hook for generating the CRD yaml (in crdgen.rs)

///
/// CoreDBSpec represents the specification for a CoreDB instance. It defines
/// various configuration options for deploying and managing the database.
/// with the tembo-controller
Expand Down
Loading
Loading