Source versioning is a core activity in software development and a foundation of DevSecOps automation. With technologies such as cloud infrastructure, build tools, CI tools, the move to declarative configuration and environments, source versioning is being used for more than just application code. We will discuss some of the strategies to use with source versioning in light of DevOps and automation principles.

1. Git Strategies for DevOps
By Stakater

2. Introduction
Source versioning
● core activity in software development.
● Distributed source versioning systems e.g. git
○ agile and collaborative approach
● Enterprise-grade git cloud services
○ Github
○ Gitlab
○ Bitbucket, etc.

3. Versioning Strategy

4. Versioning strategy
Semantic Versioning (SemVer)
● Solution for dependency versioning hell
● intuitive way to track and understand versioning
● Useful for external as well as internal dependencies
○ Microservices architecture
● Version syntax: X.Y.Z
○ X: major version number - backwards incompatible features
○ Y: minor version number - backwards compatible features
○ Z: patch number - backwards compatible bug fixes

5. Branching Strategy

6. Development workflow
Base branch
● Usually "master"
● Protected branch. No direct commits.
Development branch
● Branch for a feature or fix
● Create Pull Request once changes are ready

7. Development workflow
Github settings for branch protection

8. Development workflow
Pull Request
● Notifications
○ Slack, email, etc.
○ On creation, approval and merge.
● Checks for merging
○ Approval/code review by a peer or lead
○ Jenkins CI pipeline

9. Development workflow
Github Pull Request: pending checks and review

10. Development workflow
Github Pull Request: CI pipeline check passed

11. Development workflow
Github Pull Request: checks and review completed

12. Development workflow
PR merged -> Jenkins release pipeline is triggered
● release version bumped
○ tagged in git
○ updated within files e.g. helm chart yaml, package.json, version
file, etc.
● release pushed to Nexus

13. Version bump
Version number
● Maintained in .version file
● major/minor version number
bumped by developer in file
● patch number bumped in CD
pipeline
Project Version file

14. Repository Structure

15. GitOps
Two separate repos
● Code repo
○ Code of project
○ Built to artifact and/or docker image and/or helm chart
● Config repo
○ Defines deployment configuration
○ Which docker image or helm chart to use
○ Number of replicas
○ Deployment namespace
○ etc.

16. Contact
Email: hello@stakater.com
Web: http://stakater.com
Opensource: https://github.com/stakater/