Skip to content

Commit edb1312

Browse files
committed
Change development branch to 'devel' from 'master'
Signed-off-by: Amar Tumballi <[email protected]>
1 parent fab88f8 commit edb1312

19 files changed

+41
-248
lines changed

.github/workflows/dockerimage.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: buildx
33
on:
44
push:
55
branches:
6-
- master
6+
- devel
77
- buildx_test
88
# Add tags later (for pushing release)
99

@@ -26,23 +26,23 @@ jobs:
2626
name: Run Buildx
2727
if: success()
2828
run: |
29-
KADALU_VERSION=master docker buildx build \
29+
KADALU_VERSION=devel docker buildx build \
3030
--platform linux/arm64,linux/amd64 \
3131
--tag docker.io/kadalu/kadalu-base:latest \
3232
--output "type=image,name=docker.io/kadalu/kadalu-base,push=false" \
3333
--file operator/Dockerfile.base .
34-
KADALU_VERSION=master docker buildx build \
34+
KADALU_VERSION=devel docker buildx build \
3535
--platform linux/arm64,linux/amd64 \
36-
--tag docker.io/kadalu/kadalu-csi:master \
36+
--tag docker.io/kadalu/kadalu-csi:devel \
3737
--output "type=image,name=docker.io/kadalu/kadalu-csi,push=true" \
3838
--file csi/Dockerfile .
39-
KADALU_VERSION=master docker buildx build \
39+
KADALU_VERSION=devel docker buildx build \
4040
--platform linux/arm64,linux/amd64 \
41-
--tag docker.io/kadalu/kadalu-operator:master \
41+
--tag docker.io/kadalu/kadalu-operator:devel \
4242
--output "type=image,name=docker.io/kadalu/kadalu-operator,push=true" \
4343
--file operator/Dockerfile .
44-
KADALU_VERSION=master docker buildx build \
44+
KADALU_VERSION=devel docker buildx build \
4545
--platform linux/arm64,linux/amd64 \
46-
--tag docker.io/kadalu/kadalu-server:master \
46+
--tag docker.io/kadalu/kadalu-server:devel \
4747
--output "type=image,name=docker.io/kadalu/kadalu-server,push=true" \
4848
--file server/Dockerfile .

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ python:
1717

1818
branches:
1919
only:
20-
- master
20+
- devel
2121

2222
go: 1.12.x
2323

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ If the work you want to do is minor enhancement, or a bug fix, it is fine to ope
1515

1616
### Process of review
1717

18-
Pull requests will be evaluated by the maintainers on a schedule and if deemed beneficial will be committed to the master. Pull requests should have a descriptive name and include an summary of all changes made in the pull request description. We use either 'Squash & Merge' or 'Rebase & Merge' policy most of the time.
18+
Pull requests will be evaluated by the maintainers on a schedule and if deemed beneficial will be committed to the 'devel'. Pull requests should have a descriptive name and include an summary of all changes made in the pull request description. We use either 'Squash & Merge' or 'Rebase & Merge' policy most of the time.
1919

2020
All contributors retain the original copyright to their stuff, but by contributing to this project, you are agreeing to the [LICENSE](./LICENSE) of the project.
2121

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.PHONY: help build-grpc build-containers gen-manifest pylint prepare-release release
22

33
DOCKER_USER?=kadalu
4-
KADALU_VERSION?=master
4+
KADALU_VERSION?=devel
55
KADALU_LATEST?=latest
66

77
help:
@@ -20,7 +20,7 @@ build-grpc:
2020
build-containers:
2121
DOCKER_USER=${DOCKER_USER} KADALU_VERSION=${KADALU_VERSION} bash build.sh
2222

23-
SUFFIX?="-master"
23+
SUFFIX?="-devel"
2424

2525
gen-manifest:
2626
@echo "Generating manifest files, run the following commands"

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# KaDalu
22

3-
[![TravisCI](https://travis-ci.com/kadalu/kadalu.svg?branch=master)](https://travis-ci.com/kadalu/kadalu)
3+
[![TravisCI](https://travis-ci.com/kadalu/kadalu.svg?branch=devel)](https://travis-ci.com/kadalu/kadalu)
44
[![Operator Docker Pulls](https://img.shields.io/docker/pulls/kadalu/kadalu-operator.svg?label=DockerPulls%20Operator)](https://img.shields.io/docker/pulls/kadalu/kadalu-operator.svg)
55
[![Server Docker Pulls](https://img.shields.io/docker/pulls/kadalu/kadalu-server.svg?label=DockerPulls%20Server)](https://img.shields.io/docker/pulls/kadalu/kadalu-server.svg)
66
[![BuildX](https://github.com/kadalu/kadalu/workflows/buildx/badge.svg)](https://github.com/kadalu/kadalu/actions?query=workflow%3Abuildx)
@@ -22,7 +22,7 @@ See [Documentation](doc/)
2222

2323
One is free to pronounce 'kaDalu' as they wish. Below is a sample of how we pronounce it!
2424

25-
[<img src="https://raw.githubusercontent.com/kadalu/kadalu/master/extras/assets/speaker.svg" width="64"/>](https://raw.githubusercontent.com/kadalu/kadalu/master/extras/assets/kadalu_01.wav)
25+
[<img src="https://raw.githubusercontent.com/kadalu/kadalu/devel/extras/assets/speaker.svg" width="64"/>](https://raw.githubusercontent.com/kadalu/kadalu/devel/extras/assets/kadalu_01.wav)
2626

2727

2828
## Talks and Blog posts
@@ -49,9 +49,9 @@ See [CONTRIBUTING](CONTRIBUTING.md)
4949

5050
## ARM support
5151

52-
The release versions and 'latest' versions are not yet ARM ready! But we have an image for `linux/arm64`,`linux/arm/v7` platform support!
52+
The release versions and 'latest' versions are not yet ARM ready! But we have an image for `linux/arm64` platform support!
5353

54-
Start the operator with `kubectl create -f https://raw.githubusercontent.com/kadalu/kadalu/master/manifests/kadalu-operator-master.yaml` to get started! Once we have few users confirming it works, will tag it in a release!
54+
Start the operator with `kubectl create -f https://raw.githubusercontent.com/kadalu/kadalu/devel/manifests/kadalu-operator-devel.yaml` to get started! Once we have few users confirming it works, will tag it in a release!
5555

5656

5757
## NOTE

cli/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION ?= "master"
1+
VERSION ?= "devel"
22
PYTHON ?= python3
33
PROGNAME = kubectl-kadalu
44

cli/kubectl_kadalu/install.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def set_args(name, subparsers):
1616
arg(
1717
"--version",
1818
help="Kadalu Version to Install [default: latest]",
19-
choices=[VERSION, "master", "latest"],
19+
choices=[VERSION, "devel", "latest"],
2020
default="latest"
2121
)
2222
arg(
@@ -41,7 +41,7 @@ def run(args):
4141
""" perform install subcommand """
4242
operator_file = args.local_yaml
4343
if not operator_file:
44-
file_url = "https://raw.githubusercontent.com/kadalu/kadalu/master/manifests"
44+
file_url = "https://raw.githubusercontent.com/kadalu/kadalu/devel/manifests"
4545
version = ""
4646
insttype = ""
4747

doc/release-management.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
**Note**: If `DOCKER_USER` is specified then it will publish the built
1111
Containers to respective Dockerhub account.
1212

13-
DOCKER_USER=aravindavk KADALU_VERSION=0.4.0 make release
13+
DOCKER_USER=aravindavk KADALU_VERSION=0.7.0 make release
1414

1515
3. Send the PR with manifest file and CHANGELOG.md file changes
1616
4. Create a new Github release - [https://github.com/kadalu/kadalu/releases/new](https://github.com/kadalu/kadalu/releases/new). In the
1717
release notes, update the Operator manifest file link as,
1818

19-
https://raw.githubusercontent.com/kadalu/kadalu/master/manifests/kadalu-operator-<version>.yaml
19+
https://raw.githubusercontent.com/kadalu/kadalu/devel/manifests/kadalu-operator-<version>.yaml
2020

2121
For example,
2222

23-
kubectl create -f https://raw.githubusercontent.com/kadalu/kadalu/master/manifests/kadalu-operator-0.1.0.yaml
23+
kubectl create -f https://raw.githubusercontent.com/kadalu/kadalu/devel/manifests/kadalu-operator-0.7.0.yaml

doc/troubleshooting.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ If the log complains about ` error when creating "/kadalu/templates/csi-driver-o
3232
$ kubectl delete CSIDriver kadalu
3333
```
3434

35-
> **Note**: Use the [cleanup script](https://github.com/kadalu/kadalu/blob/master/extras/scripts/cleanup) to properly cleanup kadalu.
35+
> **Note**: Use the [cleanup script](https://github.com/kadalu/kadalu/blob/devel/extras/scripts/cleanup) to properly cleanup kadalu.
3636
3737
## Storage cannot be created - `Failed to create file system fstype=xfs device=/dev/md3`
3838

manifests/kadalu-operator-master.yaml manifests/kadalu-operator-devel.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ spec:
194194
securityContext:
195195
capabilities: {}
196196
privileged: true
197-
image: docker.io/kadalu/kadalu-operator:master
197+
image: docker.io/kadalu/kadalu-operator:devel
198198
imagePullPolicy: IfNotPresent
199199
env:
200200
- name: WATCH_NAMESPACE
@@ -210,7 +210,7 @@ spec:
210210
- name: DOCKER_USER
211211
value: "kadalu"
212212
- name: KADALU_VERSION
213-
value: "master"
213+
value: "devel"
214214
- name: KUBELET_DIR
215215
value: "/var/lib/kubelet"
216216
- name: K8S_DIST

manifests/kadalu-operator-master.yml

-207
This file was deleted.

0 commit comments

Comments
 (0)