Skip to content

Commit 67a1a22

Browse files
authored
CLOUDP-85520: Change release pipeline, add optional annotation to resourceRef namespace (#297)
1 parent 14948f0 commit 67a1a22

File tree

3 files changed

+12
-26
lines changed

3 files changed

+12
-26
lines changed

.github/workflows/release-post-merge.yml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ jobs:
2020
runs-on: ubuntu-latest
2121
env:
2222
DOCKER_RELEASE_REPO: mongodb/mongodb-atlas-kubernetes-operator
23-
REDHAT_RELEASE_REGISTRY: scan.connect.redhat.com
24-
REDHAT_OPERATOR_REPO: ospid-4b67df2e-b2d2-42ef-994e-e35dcff33ad4/mongodb-atlas-kubernetes-operator
25-
REDHAT_BUNDLE_REPO: ospid-c531b655-554d-4c70-b592-c64723a5b840/mongodb-atlas-kubernetes-operator-bundle
23+
REDHAT_SCAN_RELEASE_REGISTRY: scan.connect.redhat.com
24+
REDHAT_SCAN_OPERATOR_REPO: ospid-4b67df2e-b2d2-42ef-994e-e35dcff33ad4/mongodb-atlas-kubernetes-operator
25+
REDHAT_SCAN_BUNDLE_REPO: ospid-c531b655-554d-4c70-b592-c64723a5b840/mongodb-atlas-kubernetes-operator-bundle
26+
REDHAT_RELEASE_REGISTRY: registry.connect.redhat.com
27+
REDHAT_OPERATOR_REPO: mongodb/mongodb-atlas-kubernetes-operator
2628
QUAY_RELEASE_REGISTRY: quay.io
2729
QUAY_OPERATOR_REPO: mongodb/mongodb-atlas-kubernetes-operator
2830
QUAY_ROBOT_NAME: mongodb+mongodb_atlas_kubernetes
@@ -68,8 +70,8 @@ jobs:
6870
with:
6971
username: unused
7072
password: ${{ secrets.REDHAT_REGISTRY_PASSWORD }}
71-
repository: ${{ env.REDHAT_OPERATOR_REPO }}
72-
registry: ${{ env.REDHAT_RELEASE_REGISTRY }}
73+
repository: ${{ env.REDHAT_SCAN_OPERATOR_REPO }}
74+
registry: ${{ env.REDHAT_SCAN_RELEASE_REGISTRY }}
7375
tags: ${{ steps.tag.outputs.version }}
7476
labels: version=${{ steps.tag.outputs.version }}
7577
build_args: VERSION=${{ steps.tag.outputs.tag }}
@@ -112,20 +114,4 @@ jobs:
112114
asset_name: atlas-operator-all-in-one-${{ steps.tag.outputs.version }}.tar.gz
113115
asset_content_type: application/tgz
114116

115-
- name: Wait image in RedHhat registry
116-
env:
117-
IMAGE: ${{ env.REDHAT_RELEASE_REGISTRY }}/${{ env.REDHAT_OPERATOR_REPO }}:${{ steps.tag.outputs.version }}
118-
TIMEOUT: 60
119-
run: |
120-
chmod +x ./scripts/github-actions/await_image_push.sh
121-
./scripts/github-actions/await_image_push.sh "$IMAGE" "$TIMEOUT"
122-
123-
- name: Push Atlas Operator Bundle to RedHat Connect
124-
uses: docker/build-push-action@v1
125-
with:
126-
username: unused
127-
password: ${{ secrets.REDHAT_REGISTRY_BUNDLES_PASSWORD }}
128-
repository: ${{ env.REDHAT_BUNDLE_REPO }}
129-
registry: ${{ env.REDHAT_RELEASE_REGISTRY}}
130-
tags: ${{ steps.tag.outputs.version }}
131-
dockerfile: bundle.Dockerfile
117+
# TODO RedHad autopublish does not work. need to push bundles manually for now

pkg/api/v1/common.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ type ResourceRefNamespaced struct {
2020
Name string `json:"name"`
2121

2222
// Namespace is the namespace of the Kubernetes Resource
23+
// +optional
2324
Namespace string `json:"namespace"`
2425
}
2526

scripts/release-redhat.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ cp -r bundle.Dockerfile bundle/manifests bundle/metadata "${RH_COMMUNITY_REPO_PA
88
cd "${RH_COMMUNITY_REPO_PATH}/community-operators/mongodb-atlas-kubernetes/"
99

1010
# replace the move instructions in the docker file
11-
sed -i .bak 's/COPY bundle\/manifests/COPY manifests/' "${version}/bundle.Dockerfile"
12-
sed -i .bak 's/COPY bundle\/metadata/COPY metadata/' "${version}/bundle.Dockerfile"
13-
sed -i .bak '/COPY bundle\/tests\/scorecard \/tests\/scorecard\//d' "${version}/bundle.Dockerfile"
14-
rm "${version}/bundle.Dockerfile.bak"
11+
sed -i 's/COPY bundle\/manifests/COPY manifests/' "${version}/bundle.Dockerfile"
12+
sed -i 's/COPY bundle\/metadata/COPY metadata/' "${version}/bundle.Dockerfile"
13+
sed -i 's/COPY bundle\/tests\/scorecard/COPY tests\/scorecard/' "${version}/bundle.Dockerfile"
1514

1615
# commit
1716
git checkout -b "mongodb-atlas-operator-community-${version}"

0 commit comments

Comments
 (0)