Skip to content

Commit

Permalink
Set VERSION to 0.1.0-dev in Makefile for main branch (#207)
Browse files Browse the repository at this point in the history
As discussed in [1], it would make sense to use different `VERSION` on `main` and release branches.

[1] #200 (comment)
  • Loading branch information
rm3l committed Feb 16, 2024
1 parent 505f72e commit 9666f5a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.0.1
VERSION ?= 0.1.0-dev

This comment has been minimized.

Copy link
@nickboldt

nickboldt Feb 19, 2024

Member

would it not have made more sense to call the main branch 0.2
and to have https://github.com/janus-idp/operator/blob/1.1.x/Makefile#L6 set to 0.1.0 ?

Now we have 0.1.0-dev = main branch and 0.1.0 = 1.1.x branch, which IMHO is way more confusing.

Also how do we plan to AUTOMATE these version bumps in the Makefile?


# Using docker or podman to build and push images
CONTAINER_ENGINE ?= docker
Expand Down
Expand Up @@ -21,11 +21,11 @@ metadata:
}
]
capabilities: Seamless Upgrades
createdAt: "2024-02-13T07:11:47Z"
createdAt: "2024-02-16T16:44:06Z"
operatorframework.io/suggested-namespace: backstage-system
operators.operatorframework.io/builder: operator-sdk-v1.33.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
name: backstage-operator.v0.0.1
name: backstage-operator.v0.1.0-dev
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -221,7 +221,7 @@ spec:
value: quay.io/fedora/postgresql-15:latest
- name: RELATED_IMAGE_backstage
value: quay.io/janus-idp/backstage-showcase:latest
image: quay.io/janus-idp/operator:0.0.1
image: quay.io/janus-idp/operator:0.1.0-dev
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -326,4 +326,4 @@ spec:
name: postgresql
- image: quay.io/janus-idp/backstage-showcase:latest
name: backstage
version: 0.0.1
version: 0.1.0-dev
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Expand Up @@ -5,7 +5,7 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/janus-idp/operator
newTag: 0.0.1
newTag: 0.1.0-dev

generatorOptions:
disableNameSuffixHash: true
Expand Down

0 comments on commit 9666f5a

Please sign in to comment.