Skip to content

Commit 815dae8

Browse files
Jonathan S. Katzjkatz
authored andcommitted
Move base image default to CentOS 8
1 parent 3f007d5 commit 815dae8

File tree

21 files changed

+44
-44
lines changed

21 files changed

+44
-44
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Default values if not already set
33
ANSIBLE_VERSION ?= 2.9.*
44
PGOROOT ?= $(CURDIR)
5-
PGO_BASEOS ?= centos7
5+
PGO_BASEOS ?= centos8
66
PGO_IMAGE_PREFIX ?= crunchydata
77
PGO_IMAGE_TAG ?= $(PGO_BASEOS)-$(PGO_VERSION)
88
PGO_VERSION ?= 4.5.1

bin/push-ccp-to-gcr.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
GCR_IMAGE_PREFIX=gcr.io/crunchy-dev-test
1717

1818
CCP_IMAGE_PREFIX=crunchydata
19-
CCP_IMAGE_TAG=centos7-13.1-4.5.1
19+
CCP_IMAGE_TAG=centos8-13.1-4.5.1
2020

2121
IMAGES=(
2222
crunchy-prometheus

conf/postgres-operator/pgo.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Cluster:
22
CCPImagePrefix: registry.developers.crunchydata.com/crunchydata
33
Metrics: false
44
Badger: false
5-
CCPImageTag: centos7-13.1-4.5.1
5+
CCPImageTag: centos8-13.1-4.5.1
66
Port: 5432
77
PGBadgerPort: 10000
88
ExporterPort: 9187
@@ -81,4 +81,4 @@ Storage:
8181
Pgo:
8282
Audit: false
8383
PGOImagePrefix: registry.developers.crunchydata.com/crunchydata
84-
PGOImageTag: centos7-4.5.1
84+
PGOImageTag: centos8-4.5.1

docs/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ postgresVersion10 = "10.15"
3434
postgresVersion96 = "9.6.20"
3535
postgresVersion95 = "9.5.24"
3636
postgisVersion = "3.0"
37-
centosBase = "centos7"
37+
centosBase = "centos8"
3838

3939
[outputs]
4040
home = [ "HTML", "RSS", "JSON"]

docs/content/advanced/crunchy-postgres-exporter.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ can be specified for the API to collect. For an example of a queries.yml file, s
2424
The crunchy-postgres-exporter Docker image contains the following packages (versions vary depending on PostgreSQL version):
2525

2626
* PostgreSQL ({{< param postgresVersion13 >}}, {{< param postgresVersion12 >}}, {{< param postgresVersion11 >}}, {{< param postgresVersion10 >}}, {{< param postgresVersion96 >}} and {{< param postgresVersion95 >}})
27-
* CentOS7 - publicly available
28-
* UBI7 - customers only
27+
* CentOS 8 - publicly available
28+
* UBI 7, UBI 8 - customers only
2929
* [PostgreSQL Exporter](https://github.com/wrouesnel/postgres_exporter)
3030

3131
## Environment Variables

examples/create-by-resource/fromcrd.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"supplementalgroups": ""
4646
},
4747
"ccpimage": "crunchy-postgres-ha",
48-
"ccpimagetag": "centos7-13.1-4.5.1",
48+
"ccpimagetag": "centos8-13.1-4.5.1",
4949
"clustername": "fromcrd",
5050
"database": "userdb",
5151
"exporterport": "9187",

examples/envs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export PGO_CONF_DIR=$PGOROOT/installers/ansible/roles/pgo-operator/files
1919

2020
# the version of the Operator you run is set by these vars
2121
export PGO_IMAGE_PREFIX=registry.developers.crunchydata.com/crunchydata
22-
export PGO_BASEOS=centos7
22+
export PGO_BASEOS=centos8
2323
export PGO_VERSION=4.5.1
2424
export PGO_IMAGE_TAG=$PGO_BASEOS-$PGO_VERSION
2525

examples/helm/create-cluster/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The values is for the namespace and the postgresql cluster name
55
ccpimage: crunchy-postgres-ha
66
ccpimageprefix: registry.developers.crunchydata.com/crunchydata
7-
ccpimagetag: centos7-13.1-4.5.1
7+
ccpimagetag: centos8-13.1-4.5.1
88
namespace: pgo
99
pgclustername: hippo
1010
pgoimageprefix: registry.developers.crunchydata.com/crunchydata

examples/kustomize/createcluster/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pgo show cluster hippo -n pgo
4444
```
4545
You will see something like this if successful:
4646
```
47-
cluster : hippo (crunchy-postgres-ha:centos7-13.1-4.5.1)
47+
cluster : hippo (crunchy-postgres-ha:centos8-13.1-4.5.1)
4848
pod : hippo-8fb6bd96-j87wq (Running) on gke-xxxx-default-pool-38e946bd-257w (1/1) (primary)
4949
pvc: hippo (1Gi)
5050
deployment : hippo
@@ -79,7 +79,7 @@ pgo show cluster dev-hippo -n pgo
7979
```
8080
You will see something like this if successful:
8181
```
82-
cluster : dev-hippo (crunchy-postgres-ha:centos7-13.1-4.5.1)
82+
cluster : dev-hippo (crunchy-postgres-ha:centos8-13.1-4.5.1)
8383
pod : dev-hippo-588d4cb746-bwrxb (Running) on gke-xxxx-default-pool-95cba91c-0ppp (1/1) (primary)
8484
pvc: dev-hippo (1Gi)
8585
deployment : dev-hippo
@@ -113,7 +113,7 @@ pgo show cluster staging-hippo -n pgo
113113
```
114114
You will see something like this if successful, (Notice one of the replicas is a different size):
115115
```
116-
cluster : staging-hippo (crunchy-postgres-ha:centos7-13.1-4.5.1)
116+
cluster : staging-hippo (crunchy-postgres-ha:centos8-13.1-4.5.1)
117117
pod : staging-hippo-85cf6dcb65-9h748 (Running) on gke-xxxx-default-pool-95cba91c-0ppp (1/1) (primary)
118118
pvc: staging-hippo (1Gi)
119119
pod : staging-hippo-lnxw-cf47d8c8b-6r4wn (Running) on gke-xxxx-default-pool-21b7282d-rqkj (1/1) (replica)
@@ -154,7 +154,7 @@ pgo show cluster prod-hippo -n pgo
154154
```
155155
You will see something like this if successful, (Notice one of the replicas is a different size):
156156
```
157-
cluster : prod-hippo (crunchy-postgres-ha:centos7-13.1-4.5.1)
157+
cluster : prod-hippo (crunchy-postgres-ha:centos8-13.1-4.5.1)
158158
pod : prod-hippo-5d6dd46497-rr67c (Running) on gke-xxxx-default-pool-21b7282d-rqkj (1/1) (primary)
159159
pvc: prod-hippo (1Gi)
160160
pod : prod-hippo-flty-84d97c8769-2pzbh (Running) on gke-xxxx-default-pool-95cba91c-0ppp (1/1) (replica)

examples/kustomize/createcluster/base/pgcluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
annotations: {}
4343
ccpimage: crunchy-postgres-ha
4444
ccpimageprefix: registry.developers.crunchydata.com/crunchydata
45-
ccpimagetag: centos7-13.1-4.5.1
45+
ccpimagetag: centos8-13.1-4.5.1
4646
clustername: hippo
4747
customconfig: ""
4848
database: hippo

0 commit comments

Comments
 (0)