Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

ci: sepatate autotag from build #108

Merged
merged 2 commits into from
Aug 17, 2023
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/autotag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Autotag

on:
push:
branches:
- main

jobs:
autotag:
name: Create tag if version changes
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3

# Extract version data and create tag
- uses: butlerlogic/action-autotag@1.1.2
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
with:
strategy: regex
root: "VERSION"
regex_pattern: "(.*)"
tag_prefix: "v"
14 changes: 1 addition & 13 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Build and Release

on:
push:
branches:
- main
tags:
- 'v*'

Expand All @@ -18,16 +16,6 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v3

# Extract version data and create tag
- uses: butlerlogic/action-autotag@1.1.2
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
with:
strategy: regex
root: "VERSION"
regex_pattern: "(.*)"
tag_prefix: "v"

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
Expand Down Expand Up @@ -65,7 +53,6 @@ jobs:

- name: GitHub Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
generate_release_notes: true
draft: true
Expand Down Expand Up @@ -117,6 +104,7 @@ jobs:
helm-release:
# Depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
# see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
name: Release helm chart
permissions:
contents: write
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.2
0.3.3
8 changes: 4 additions & 4 deletions bundle/manifests/koor-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2023-08-01T04:50:22Z"
createdAt: "2023-08-17T22:05:59Z"
operators.operatorframework.io/builder: operator-sdk-v1.26.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
name: koor-operator.v0.3.2
name: koor-operator.v0.3.3
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -183,7 +183,7 @@ spec:
- --leader-elect
command:
- /manager
image: docker.io/koorinc/koor-operator:v0.3.2
image: docker.io/koorinc/koor-operator:v0.3.3
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -286,7 +286,7 @@ spec:
provider:
name: Koor Technology, Inc.
url: koor.tech
version: 0.3.2
version: 0.3.3
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
4 changes: 2 additions & 2 deletions charts/koor-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ type: application
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
# To change this, change the version inside the file VERSION
version: 0.3.2
version: 0.3.3

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
# To change this, change the version inside the file VERSION
appVersion: "v0.3.2"
appVersion: "v0.3.3"

# The optional kubeVersion field can define semver constraints on supported Kubernetes versions.
# Helm will validate the version constraints when installing the chart and fail if the cluster
Expand Down
2 changes: 1 addition & 1 deletion charts/koor-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ The following table lists the configurable parameters of the rook-operator chart
| `controllerManager.manager.args` | Operator args | `["--health-probe-bind-address=:8081","--metrics-bind-address=127.0.0.1:8080","--leader-elect"]` |
| `controllerManager.manager.containerSecurityContext` | Operator container security context | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}` |
| `controllerManager.manager.image.repository` | Operator image repository | `"docker.io/koorinc/koor-operator"` |
| `controllerManager.manager.image.tag` | Operator image tag | `"v0.3.2"` |
| `controllerManager.manager.image.tag` | Operator image tag | `"v0.3.3"` |
| `controllerManager.manager.resources` | Operator container resources | `{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"10m","memory":"128Mi"}}` |
| `controllerManager.replicas` | | `1` |
| `koorCluster.spec.dashboardEnabled` | Enable the Ceph MGR dashboard. | `true` |
Expand Down
2 changes: 1 addition & 1 deletion charts/koor-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ controllerManager:
# -- Operator image repository
repository: docker.io/koorinc/koor-operator
# -- Operator image tag
tag: v0.3.2
tag: v0.3.3
# -- Operator container resources
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: docker.io/koorinc/koor-operator
newTag: v0.3.2
newTag: v0.3.3
2 changes: 1 addition & 1 deletion utils/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ limitations under the License.
package utils

const (
OperatorVersion = "0.3.2"
OperatorVersion = "0.3.3"
)