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

yet another olm CI fixes #707

Merged
merged 1 commit into from
Nov 1, 2021
Merged

yet another olm CI fixes #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions .github/workflows/olm_pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
inputs:
bundleVersion:
description: Version of the bundle that should be generated. If not provided, the latest release tag is taken
description: Version of the bundle that should be generated. If not provided, the latest release tag is taken. Use 'master' for incorporating the latest changes in repo
required: false
default: ""
upstreamRepo:
Expand Down Expand Up @@ -43,6 +43,7 @@ jobs:
- name: Generate OLM bundle
env:
TOOL_VERSION: ${{ github.event.inputs.olmBundleToolVersion }}
PREVIOUS_VERSION: "v0.0.1" # remove me after the pr on community-operators repo is merged
DEBUG: 1
run: |
./olm/generate.sh ${{ steps.get_version.outputs.version }}
Expand All @@ -69,7 +70,7 @@ jobs:
push-to-fork: k8gb-io/community-operators
path: sandbox
commit-message: OLM bundle for k8gb@${{ steps.get_version.outputs.bundleDir }}
title: OLM bundle for k8gb@${{ steps.get_version.outputs.bundleDir }}
title: operators k8gb ({{ steps.get_version.outputs.bundleDir }})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this title change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not necessary, but every time we create this PR with this title, it gets automatically renamed to this form
Screenshot 2021-11-01 at 12 11 41

body: |
:package: Update k8gb operator bundle :package:

Expand All @@ -90,7 +91,7 @@ jobs:

This automated PR was created by [this action][1].

[1]: https://github.com/k8gb-io/k8gb/runs/${GITHUB_RUN_ID}
[1]: https://github.com/k8gb-io/k8gb/runs/${{ github.run_id }}
branch: k8gb-${{ steps.get_version.outputs.bundleDir }}
delete-branch: true
signoff: true
Expand Down
4 changes: 4 additions & 0 deletions chart/k8gb/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ annotations:
name: gslbs.k8gb.absa.oss
displayName: Gslb
description: Gslb resource for global load balancing strategy configuration
- kind: DNSEndpoint
name: dnsendpoints.externaldns.k8s.io
version: v1alpha1
description: Using ExternalDNS it synchronizes exposed Kubernetes Services and Ingresses with DNS providers
artifacthub.io/crdsExamples: |
- apiVersion: k8gb.absa.oss/v1beta1
kind: Gslb
Expand Down
1 change: 0 additions & 1 deletion olm/annotations.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ annotations:
certified: "false"
createdAt: "2021-09-24 12:00:00"
description: A cloud native Kubernetes Global Balancer
namespace: placeholder
operatorframework.io/suggested-namespace: k8gb
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
operators.operatorframework.io.bundle.manifests.v1: manifests/
Expand Down
2 changes: 2 additions & 0 deletions olm/clusterserviceversion.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
apiVersion: v1alpha1
kind: ClusterServiceVersion
metadata:
namespace: placeholder
spec:
maturity: alpha
minKubeVersion: 1.17.0
Expand Down
5 changes: 4 additions & 1 deletion olm/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ main() {
else
git checkout v${_VERSION}
fi
PREVIOUS_VERSION=${PREVIOUS_VERSION:-$(git describe --abbrev=0 --tags v${_VERSION}^)}

generate
}

Expand All @@ -39,7 +41,8 @@ generate() {
--name-template=k8gb \
--set k8gb.securityContext.runAsUser=null | ${OLM_BINARY} \
--chart-file-path=${DIR}/../chart/k8gb/Chart.yaml \
--version=${_VERSION} \
--version=v${_VERSION} \
--replaces-version=${PREVIOUS_VERSION} \
--helm-chart-overrides \
--output-dir ${DIR}
git checkout ${DIR}/annotations.yaml.tmpl
Expand Down