public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ineffectual assignment of the envVars for connection pooler (#2165) 

* Ineffectual assignment of the envVars for connection pooler
* Fixed codegen in case of the GOPATH is specified explicitly
This commit is contained in:
Dmitry Volodin 2023-01-12 13:38:54 +03:00 committed by GitHub
parent 021ab07a23
commit ce1fee8586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/update-codegen.sh
View File

@ -18,7 +18,8 @@ trap "cleanup" EXIT SIGINT
bash "${CODEGEN_PKG}/generate-groups.sh" all \ bash "${CODEGEN_PKG}/generate-groups.sh" all \
"${OPERATOR_PACKAGE_ROOT}/pkg/generated" "${OPERATOR_PACKAGE_ROOT}/pkg/apis" \ "${OPERATOR_PACKAGE_ROOT}/pkg/generated" "${OPERATOR_PACKAGE_ROOT}/pkg/apis" \
"acid.zalan.do:v1 zalando.org:v1" \ "acid.zalan.do:v1 zalando.org:v1" \
--go-header-file "${SCRIPT_ROOT}"/hack/custom-boilerplate.go.txt --go-header-file "${SCRIPT_ROOT}"/hack/custom-boilerplate.go.txt \
-o ./
cp -r "${OPERATOR_PACKAGE_ROOT}"/pkg/* "${TARGET_CODE_DIR}" cp -r "${OPERATOR_PACKAGE_ROOT}"/pkg/* "${TARGET_CODE_DIR}"

4
pkg/cluster/connection_pooler.go
View File

@ -324,7 +324,6 @@ func (c *Cluster) generateConnectionPoolerPodTemplate(role PostgresRole) (
Protocol: v1.ProtocolTCP, Protocol: v1.ProtocolTCP,
}, },
}, },
Env: envVars,
ReadinessProbe: &v1.Probe{ ReadinessProbe: &v1.Probe{
ProbeHandler: v1.ProbeHandler{ ProbeHandler: v1.ProbeHandler{
TCPSocket: &v1.TCPSocketAction{ TCPSocket: &v1.TCPSocketAction{
@ -341,7 +340,7 @@ func (c *Cluster) generateConnectionPoolerPodTemplate(role PostgresRole) (
// 1. Add environment variables to tell pgBouncer where to find the TLS certificates // 1. Add environment variables to tell pgBouncer where to find the TLS certificates
// 2. Reference the secret in a volume // 2. Reference the secret in a volume
// 3. Mount the volume to the container at /tls // 3. Mount the volume to the container at /tls
poolerVolumes := []v1.Volume{} var poolerVolumes []v1.Volume
if spec.TLS != nil && spec.TLS.SecretName != "" { if spec.TLS != nil && spec.TLS.SecretName != "" {
// Env vars // Env vars
crtFile := spec.TLS.CertificateFile crtFile := spec.TLS.CertificateFile
@ -383,6 +382,7 @@ func (c *Cluster) generateConnectionPoolerPodTemplate(role PostgresRole) (
}} }}
} }
poolerContainer.Env = envVars
tolerationsSpec := tolerations(&spec.Tolerations, c.OpConfig.PodToleration) tolerationsSpec := tolerations(&spec.Tolerations, c.OpConfig.PodToleration)
podTemplate := &v1.PodTemplateSpec{ podTemplate := &v1.PodTemplateSpec{