Merge branch 'CrunchyData:master' into master

Author: dsessler7

internal/pgbackrest/iana.go

@@ -0,0 +1,27 @@
+/*
+ Copyright 2021 - 2022 Crunchy Data Solutions, Inc.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package pgbackrest
+
+// The protocol used by pgBackRest is registered with the Internet Assigned
+// Numbers Authority (IANA).
+// - https://www.iana.org/assignments/service-names-port-numbers
+const (
+	// IANAPortNumber is the port assigned to pgBackRest at the IANA.
+	IANAPortNumber = 8432
+
+	// IANAServiceName is the name of the pgBackRest protocol at the IANA.
+	IANAServiceName = "pgbackrest"
+)

internal/postgres/iana.go

@@ -0,0 +1,27 @@
+/*
+ Copyright 2021 - 2022 Crunchy Data Solutions, Inc.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package postgres
+
+// The protocol used by PostgreSQL is registered with the Internet Assigned
+// Numbers Authority (IANA).
+// - https://www.iana.org/assignments/service-names-port-numbers
+const (
+	// IANAPortNumber is the port assigned to PostgreSQL at the IANA.
+	IANAPortNumber = 5432
+
+	// IANAServiceName is the name of the PostgreSQL protocol at the IANA.
+	IANAServiceName = "postgresql"
+)

testing/kuttl/e2e/exporter/13--check-exporter.yaml

@@ -4,17 +4,17 @@ kind: TestStep
 commands:
   - script: |
       set -e
+      # Wait some time so that the instance pod is redeployed
+      # TODO: automate this wait
+      sleep 30
+      
       PRIMARY=$(
         kubectl get pod --namespace "${NAMESPACE}" \
           --output name --selector '
             postgres-operator.crunchydata.com/cluster=exporter-tls,
             postgres-operator.crunchydata.com/role=master'
       )
 
-      # Wait some time so that the instance pod is redeployed
-      # TODO: automate this wait
-      sleep 30
-
       {
         METRICS=$(kubectl exec --namespace "${NAMESPACE}" \
           "${PRIMARY}" -c exporter \