Release 0.21.0

.github/actions/gen-install-scripts/Dockerfile

@@ -5,15 +5,21 @@ ENV KUBECTL_VERSION 1.18.12
 # Install
 RUN curl -L https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl -o /usr/bin/kubectl && \
     chmod +x /usr/bin/kubectl
+
 RUN cd /usr/local/bin &&\
     curl -L https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash
+
 RUN CONTROLLER_GEN_TMP_DIR=$(mktemp -d) && \
     cd $CONTROLLER_GEN_TMP_DIR && \
     go mod init tmp && \
     go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 && \
     rm -rf $CONTROLLER_GEN_TMP_DIR && \
     CONTROLLER_GEN=${GOBIN}/controller-gen
 
+RUN curl -LO https://github.com/operator-framework/operator-sdk/releases/download/v1.4.2/operator-sdk_linux_amd64 && \
+    chmod +x operator-sdk_linux_amd64 && \
+    mv operator-sdk_linux_amd64 /usr/local/bin/operator-sdk
+
 # Copies your code file from your action repository to the filesystem path `/` of the container
 COPY entrypoint.sh /home/entrypoint.sh
 RUN chmod +x /home/entrypoint.sh

.github/actions/gen-install-scripts/action.yml

@@ -4,6 +4,9 @@ inputs:
   IMAGE_URL:
     description: "Operator image"
     required: true
+  VERSION:
+    description: "Version of the Operator"
+    required: true
   ENV:
     description: "Kustomize patch name (enviroment configuration patch)"
     required: true

.github/actions/gen-install-scripts/entrypoint.sh

@@ -19,6 +19,7 @@ cd -
 
 which kustomize
 kustomize version
+
 # all-in-one
 kustomize build --load-restrictor LoadRestrictionsNone "config/release/${INPUT_ENV}/allinone" > "${target_dir}/all-in-one.yaml"
 echo "Created all-in-one config"
@@ -36,4 +37,7 @@ echo "Created namespaced config"
 # crds
 cp config/crd/bases/* "${crds_dir}"
 
-
+# CSV bundle
+operator-sdk generate kustomize manifests -q --apis-dir=pkg/api
+kustomize build --load-restrictor LoadRestrictionsNone config/manifests | operator-sdk generate bundle -q --overwrite --version "${VERSION}"
+operator-sdk bundle validate ./bundle

.github/actions/push-files/Dockerfile

@@ -1,9 +1,8 @@
-#TODO change to alpine
 FROM alpine/git:latest
 
 # Install GitHub CLI
 RUN apk update && \
-    apk add --no-cache libc6-compat
+    apk add --no-cache libc6-compat bash
 RUN mkdir ghcli && cd ghcli && \
     wget https://github.com/cli/cli/releases/download/v1.5.0/gh_1.5.0_linux_386.tar.gz -O ghcli.tar.gz --no-check-certificate  && \
     tar --strip-components=1 -xf ghcli.tar.gz -C /usr/local

.github/actions/push-files/action.yml

@@ -4,7 +4,7 @@ inputs:
   GITHUB_TOKEN:
     description: "Action token"
     required: true
-  FILE_TO_COMMIT:
+  PATH_TO_COMMIT:
     description: "Target file which will be committed"
     required: true
   DESTINATION_BRANCH:

.github/actions/push-files/entrypoint.sh

@@ -1,28 +1,36 @@
-#!/bin/sh
+#!/bin/bash
 
-#set -eou pipefail
+set -eou pipefail
 
-#commit file to the destination branch
+commit_single_file() {
+  # Commit to the branch
+  file="$1"
+  sha=$(git rev-parse "$DESTINATION_BRANCH:$file") || true
+  content=$(base64 "$file")
+  message="Pushing $file using GitHub API"
 
-MESSAGE="generated $FILE_TO_COMMIT"
-SHA=$(git rev-parse "$DESTINATION_BRANCH:$FILE_TO_COMMIT")
-CONTENT=$(base64 "$FILE_TO_COMMIT")
-echo "$DESTINATION_BRANCH:$FILE_TO_COMMIT:$SHA"
+  echo "$DESTINATION_BRANCH:$file:$sha"
+  if [ "$sha" = "$DESTINATION_BRANCH:$file" ]; then
+      echo "File does not exist"
+      gh api --method PUT "/repos/:owner/:repo/contents/$file" \
+          --field message="$message" \
+          --field content="$content" \
+          --field encoding="base64" \
+          --field branch="$DESTINATION_BRANCH"
+  else
+      echo "File exists"
+      gh api --method PUT "/repos/:owner/:repo/contents/$file" \
+          --field message="$message" \
+          --field content="$content" \
+          --field encoding="base64" \
+          --field branch="$DESTINATION_BRANCH" \
+          --field sha="$sha"
+  fi
+}
+
+# simple 'for loop' does not work correctly, see https://github.com/koalaman/shellcheck/wiki/SC2044#correct-code
+while IFS= read -r -d '' file
+do
+  commit_single_file "$file"
+done <   <(find "${PATH_TO_COMMIT}" -type f -print0)
 
-# Commit to the branch
-if [ "$SHA" = "$DESTINATION_BRANCH:$FILE_TO_COMMIT" ]; then
-    echo "File does not exist"
-    gh api --method PUT "/repos/:owner/:repo/contents/$FILE_TO_COMMIT" \
-        --field message="$MESSAGE" \
-        --field content="$CONTENT" \
-        --field encoding="base64" \
-        --field branch="$DESTINATION_BRANCH"
-else
-    echo "File exists"
-    gh api --method PUT "/repos/:owner/:repo/contents/$FILE_TO_COMMIT" \
-        --field message="$MESSAGE" \
-        --field content="$CONTENT" \
-        --field encoding="base64" \
-        --field branch="$DESTINATION_BRANCH" \
-        --field sha="$SHA"
-fi

.github/workflows/release-branch.yml

@@ -10,6 +10,7 @@ on:
         description: "Release version:"
         required: true
 
+
 jobs:
   create-release-branch:
     name: Create Release
@@ -25,64 +26,37 @@ jobs:
       with:
         fetch-depth: 0 #required for tags
 
-    - name: Create all-in-one installation script
+    - name: Create deploy configurations
       uses: ./.github/actions/gen-install-scripts
       with:
         IMAGE_URL: ${{ env.DOCKER_RELEASE_REPO }}:${{ env.VERSION }}
+        VERSION: ${{ env.VERSION }}
         ENV: prod
 
     - name: Create branch and push it
       run: |
         git checkout -b "release/${VERSION}"
         git push origin "release/${VERSION}"
 
-    - name: Commit all-in-one
-      uses: ./.github/actions/push-files
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        FILE_TO_COMMIT: "deploy/all-in-one.yaml"
-        DESTINATION_BRANCH: "release/${{ env.VERSION }}"
-
-    - name: Commit crd project
-      uses: ./.github/actions/push-files
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        FILE_TO_COMMIT: "deploy/crds/atlas.mongodb.com_atlasprojects.yaml"
-        DESTINATION_BRANCH: "release/${{ env.VERSION }}"
-
-    - name: Commit crd cluster
-      uses: ./.github/actions/push-files
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        FILE_TO_COMMIT: "deploy/crds/atlas.mongodb.com_atlasclusters.yaml"
-        DESTINATION_BRANCH: "release/${{ env.VERSION }}"
-
-    - name: Commit namespaced crds
-      uses: ./.github/actions/push-files
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        FILE_TO_COMMIT: "deploy/namespaced/crds.yaml"
-        DESTINATION_BRANCH: "release/${{ env.VERSION }}"
-
-    - name: Commit namespaced config
+    - name: Commit and push deploy directory
       uses: ./.github/actions/push-files
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        FILE_TO_COMMIT: "deploy/namespaced/namespaced-config.yaml"
+        PATH_TO_COMMIT: "deploy"
         DESTINATION_BRANCH: "release/${{ env.VERSION }}"
 
-    - name: Commit clusterwide crds
+    - name: Commit and push bundle directory
       uses: ./.github/actions/push-files
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        FILE_TO_COMMIT: "deploy/clusterwide/crds.yaml"
+        PATH_TO_COMMIT: "bundle"
         DESTINATION_BRANCH: "release/${{ env.VERSION }}"
 
-    - name: Commit clusterwide config
+    - name: Commit and push bundle dockerfile
       uses: ./.github/actions/push-files
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        FILE_TO_COMMIT: "deploy/clusterwide/clusterwide-config.yaml"
+        PATH_TO_COMMIT: "bundle.Dockerfile"
         DESTINATION_BRANCH: "release/${{ env.VERSION }}"
 
     - name: Create PR

.github/workflows/test.yml

@@ -97,6 +97,7 @@ jobs:
       uses: ./.github/actions/gen-install-scripts
       with:
         IMAGE_URL: ${{ env.DOCKER_REPO }}:${{ steps.prepare.outputs.tag }}
+        VERSION: ${{ steps.prepare.outputs.tag }}
         ENV: dev
 
     - name: Set properties

bundle.Dockerfile

@@ -0,0 +1,15 @@
+FROM scratch
+
+LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
+LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
+LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
+LABEL operators.operatorframework.io.bundle.package.v1=mongodb-atlas-kubernetes
+LABEL operators.operatorframework.io.bundle.channels.v1=alpha
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.4.2
+LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
+LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
+LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
+LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
+COPY bundle/manifests /manifests/
+COPY bundle/metadata /metadata/
+COPY bundle/tests/scorecard /tests/scorecard/