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.

Sign up for GitHub

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

Jump to bottom

Fix the jobs to release on openshift certification #998

Merged
merged 3 commits into from
Jul 28, 2023
+257 −211
Merged

Fix the jobs to release on openshift certification #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1dd0ad
Fix the jobs to release on openshift certification
prafull01 Jul 24, 2023
a25656d
Update CRDB versions
prafull01 Jul 25, 2023
432ada6
Add additional env variables to CSV for certification
prafull01 Jul 27, 2023
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
4 changes: 2 additions & 2 deletions build/release/teamcity-publish-openshift.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ set -euxo pipefail
source "$(dirname "${0}")/teamcity-support.sh"

RH_PROJECT_ID="5e6027425c5456060d5f6084"
RH_REGISTRY="scan.connect.redhat.com"
RH_OPERATOR_IMG="${RH_REGISTRY}/ospid-cf721588-ad8a-4618-938c-5191c5e10ae4/cockroachdb-operator:${TAG}"
RH_REGISTRY="quay.io"
RH_OPERATOR_IMG="${RH_REGISTRY}/redhat-isv-containers/${RH_PROJECT_ID}:${TAG}"
rail marked this conversation as resolved.
Show resolved Hide resolved

OPERATOR_IMG="docker.io/cockroachdb/cockroach-operator:${TAG}"
if ! [[ -z "${DRY_RUN}" ]] ; then
Expand Down
4 changes: 4 additions & 0 deletions config/manager/patches/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ spec:
value: cockroachdb/cockroach:v22.2.9
- name: RELATED_IMAGE_COCKROACH_v22_2_10
value: cockroachdb/cockroach:v22.2.10
- name: RELATED_IMAGE_COCKROACH_v22_2_12
value: cockroachdb/cockroach:v22.2.12
- name: RELATED_IMAGE_COCKROACH_v23_1_0
value: cockroachdb/cockroach:v23.1.0
- name: RELATED_IMAGE_COCKROACH_v23_1_1
Expand All @@ -226,3 +228,5 @@ spec:
value: cockroachdb/cockroach:v23.1.4
- name: RELATED_IMAGE_COCKROACH_v23_1_5
value: cockroachdb/cockroach:v23.1.5
- name: RELATED_IMAGE_COCKROACH_v23_1_6
value: cockroachdb/cockroach:v23.1.6
418 changes: 217 additions & 201 deletions config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions config/manifests/patches/deployment_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ spec:
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9ab968e4ca62f23bf9848e5475ef4076df7318a8560f63d5b2090a32af6fe4e2
- name: RELATED_IMAGE_COCKROACH_v22_2_10
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:818f592c50d4ed5599faa053344f7ecd963003352f1faa3b72dc0f5e00a0e78b
- name: RELATED_IMAGE_COCKROACH_v22_2_12
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51
- name: RELATED_IMAGE_COCKROACH_v23_1_0
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682
- name: RELATED_IMAGE_COCKROACH_v23_1_1
Expand All @@ -235,4 +237,6 @@ spec:
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:42c9930d6861f6a2147ed6e01827eddd730279966763ec68868567a19cc164ab
- name: RELATED_IMAGE_COCKROACH_v23_1_5
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3
- name: RELATED_IMAGE_COCKROACH_v23_1_6
value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb
image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
2 changes: 1 addition & 1 deletion config/samples/crdb-tls-example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ kind: CrdbCluster
metadata:
name: crdb-tls-example
spec:
cockroachDBVersion: v23.1.5
cockroachDBVersion: v23.1.6
dataStore:
pvc:
spec:
Expand Down
18 changes: 15 additions & 3 deletions config/templates/csv.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,16 @@ spec:
expose the services using Ingress
displayName: Cockroach Database Ingress
path: ingress
- description: '(Optional) LogConfigMap define the config map which contains
log configuration used to send the logs through the proper channels in the
cockroachdb. Logging configuration is available for cockroach version v21.1.0
onwards. The logging configuration is taken in format of yaml file, you
can check the logging configuration here (https://www.cockroachlabs.com/docs/stable/configure-logs.html#default-logging-configuration)
The default logging for cockroach version v20.x or less is stderr, logging
API is ignored for older versions. NOTE: The `data` field of map must contain
an entry called `logging.yaml` that contains config options.'
displayName: Cockroach Database Logging configuration config map
path: logConfigMap
- description: (Optional) If specified, the pod's nodeSelector
displayName: Map of nodeSelectors to match when scheduling pods on nodes
path: nodeSelector
Expand Down Expand Up @@ -181,9 +191,11 @@ spec:
minKubeVersion: 1.18.0
provider:
name: Cockroach Labs
version: 0.0.0
relatedImages:
{{- range .CrdbVersions}}
- name: RELATED_IMAGE_COCKROACH_{{ underscore .Tag }}
image: {{ .RedhatImage }}
- image: {{ .RedhatImage }}
name: RELATED_IMAGE_COCKROACH_{{ underscore .Tag }}
{{- end }}
- image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
name: RELATED_IMAGE_COCKROACH_OPERATOR
version: 0.0.0
6 changes: 6 additions & 0 deletions crdb-versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,9 @@ CrdbVersions:
- image: cockroachdb/cockroach:v22.2.10
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:818f592c50d4ed5599faa053344f7ecd963003352f1faa3b72dc0f5e00a0e78b
tag: v22.2.10
- image: cockroachdb/cockroach:v22.2.12
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:2a128b570352a5a7f82b27353f9b774caccce83e0e7bb2673e4802d96ad0bd51
tag: v22.2.12
- image: cockroachdb/cockroach:v23.1.0
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:f3ffebd812881a830ff46c860984814dd61edcd51b478ebd3667759fb7710682
tag: v23.1.0
Expand All @@ -322,3 +325,6 @@ CrdbVersions:
- image: cockroachdb/cockroach:v23.1.5
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acbfee4492327a720fe7da76929a86192d8af2442bbb76f0a089f6a81a890be3
tag: v23.1.5
- image: cockroachdb/cockroach:v23.1.6
redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:9492894eaa5f43d00ac80b60029b32a0b0a85ae88ba609b46f98702c9349a5bb
tag: v23.1.6
2 changes: 1 addition & 1 deletion examples/client-secure-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
serviceAccountName: cockroachdb-sa
containers:
- name: cockroachdb-client-secure
image: cockroachdb/cockroach:v23.1.5
image: cockroachdb/cockroach:v23.1.6
imagePullPolicy: IfNotPresent
volumeMounts:
- name: client-certs
Expand Down
4 changes: 2 additions & 2 deletions examples/example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ spec:
memory: 8Gi
tlsEnabled: true
# You can set either a version of the db or a specific image name
# cockroachDBVersion: v23.1.5
# cockroachDBVersion: v23.1.6
image:
name: cockroachdb/cockroach:v23.1.5
name: cockroachdb/cockroach:v23.1.6
# nodes refers to the number of crdb pods that are created
# via the statefulset
nodes: 3
Expand Down
2 changes: 1 addition & 1 deletion examples/smoketest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ spec:
memory: 300Mi
tlsEnabled: true
image:
name: cockroachdb/cockroach:v23.1.5
name: cockroachdb/cockroach:v23.1.6
nodes: 3
4 changes: 4 additions & 0 deletions install/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,8 @@ spec:
value: cockroachdb/cockroach:v22.2.9
- name: RELATED_IMAGE_COCKROACH_v22_2_10
value: cockroachdb/cockroach:v22.2.10
- name: RELATED_IMAGE_COCKROACH_v22_2_12
value: cockroachdb/cockroach:v22.2.12
- name: RELATED_IMAGE_COCKROACH_v23_1_0
value: cockroachdb/cockroach:v23.1.0
- name: RELATED_IMAGE_COCKROACH_v23_1_1
Expand All @@ -584,6 +586,8 @@ spec:
value: cockroachdb/cockroach:v23.1.4
- name: RELATED_IMAGE_COCKROACH_v23_1_5
value: cockroachdb/cockroach:v23.1.5
- name: RELATED_IMAGE_COCKROACH_v23_1_6
value: cockroachdb/cockroach:v23.1.6
- name: OPERATOR_NAME
value: cockroachdb
- name: POD_NAME
Expand Down