Skip to content
This repository was archived by the owner on Jun 26, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.git
test
out
bin
8 changes: 4 additions & 4 deletions .github/workflows/merge-to-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master

env:
SDK_VERSION: "0.16.0"
SDK_VERSION: "1.3.0"
OPM_VERSION: "1.15.2"
GO111MODULE: on
K8S_VERSION: "1.19.2"
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:

- name: Set up CLI
run: |
curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v${SDK_VERSION}/operator-sdk-v${SDK_VERSION}-x86_64-linux-gnu
curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v${SDK_VERSION}/operator-sdk_linux_amd64
chmod +x operator-sdk
mv -v operator-sdk $GITHUB_WORKSPACE/bin/

Expand Down Expand Up @@ -72,11 +72,11 @@ jobs:

- name: Unit Tests with Code Coverage
run: |
make test-unit-with-coverage
make test

- name: Upload Code Coverage Report
uses: codecov/codecov-action@v1
with:
file: out/test-coverage/*.txt
file: cover.out
verbose: true
fail_ci_if_error: true
10 changes: 5 additions & 5 deletions .github/workflows/pr-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ jobs:

- name: Unit Tests with Code Coverage
run: |
make test-unit-with-coverage
make test

- name: Upload Code Coverage Report
uses: codecov/codecov-action@v1
with:
file: out/test-coverage/*.txt
file: cover.out
verbose: true
fail_ci_if_error: true

Expand All @@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-latest

env:
SDK_VERSION: "0.16.0"
SDK_VERSION: "1.3.0"
OPM_VERSION: "1.15.2"
MINIKUBE_WANTUPDATENOTIFICATION: false
MINIKUBE_WANTREPORTERRORPROMPT: false
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:

- name: Set up CLI
run: |
curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v${SDK_VERSION}/operator-sdk-v${SDK_VERSION}-x86_64-linux-gnu
curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v${SDK_VERSION}/operator-sdk_linux_amd64
chmod +x operator-sdk
mv -v operator-sdk $GITHUB_WORKSPACE/bin/

Expand Down Expand Up @@ -130,4 +130,4 @@ jobs:
timeout-minutes: 60
run: |
eval $(minikube docker-env)
make OPERATOR_REPO_REF=$(minikube ip):5000/sbo SKIP_REGISTRY_LOGIN=true release-operator -o registry-login test-acceptance-with-bundle
make OPERATOR_REPO_REF=$(minikube ip):5000/sbo SKIP_REGISTRY_LOGIN=true release-operator -o registry-login test-acceptance-with-bundle
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,19 @@ tags
### Logs
**/*.log
**/*/__pycache__


# editor and IDE paraphernalia
.idea
*.swp
*.swo
*~

bin
testbin/*

# Test binary, build with `go test -c`
*.test

bundle
bundle.Dockerfile
21 changes: 21 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# The following image is a mirror of CI image, performed as:
# * Copy the oc login command from https://api.ci.openshift.org/oauth/token/request
# * oc login api.ci.openshift.org ... # command from the web page
# * oc registry login
# * skopeo copy docker://registry.svc.ci.openshift.org/ocp/builder:golang-1.15 docker:/quay.io/redhat-developer/servicebinding-operator:builder-golang-1.15
FROM quay.io/redhat-developer/servicebinding-operator:builder-golang-1.15 AS builder

WORKDIR /workspace
COPY / /workspace/

# Build
RUN make build

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/static:nonroot
WORKDIR /
COPY --from=builder /workspace/bin/manager .
USER 65532:65532

ENTRYPOINT ["/manager"]
48 changes: 0 additions & 48 deletions Dockerfile.rhel

This file was deleted.

Loading