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

Jump to bottom

feat:New Enterprise version #2656

Draft
wants to merge 10 commits into
base: enterprise/next
Choose a base branch
from
Draft

feat:New Enterprise version #2656

wants to merge 10 commits into from

Conversation

rjha-splunk
Copy link
Collaborator

@rjha-splunk rjha-splunk commented Dec 18, 2024 •
edited
Loading

Enterprise version Initial Draft

@rjha-splunk rjha-splunk deleted the enterprise_beta branch December 18, 2024 13:04
@github-actions github-actions bot locked and limited conversation to collaborators Dec 18, 2024
@rjha-splunk rjha-splunk reopened this Dec 18, 2024
ikheifets-splunk
ikheifets-splunk approved these changes Dec 19, 2024
View reviewed changes
Copy link
Contributor

@ikheifets-splunk ikheifets-splunk left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Approved! We had a discussion with Rahul about is it should be a enterprise branch in repo or just a copy-paste enterprise folder. As I understand the next enterprise release would have a completely another approach and architecture.

cc @mstopa-splunk

@rjha-splunk rjha-splunk marked this pull request as ready for review January 8, 2025 09:58
mstopa-splunk
mstopa-splunk reviewed Jan 28, 2025
View reviewed changes
.github/workflows/cd-ghcr.io.yaml Outdated
@@ -34,7 +34,7 @@ jobs:
strategy:
max-parallel: 1
matrix:
container: [container3, container3lite]
container: [container3, container3lite , enterprise]
Copy link
Contributor

Choose a reason for hiding this comment

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

Due to:

on:
  push:
    branches-ignore:
      - "**"
    tags:
      - "v[0-9]+.[0-9]+.[0-9]+"

cd-ghcr.io will only run on the main type of tags, like v3.34.1, and we should separate enterprise tags

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed

.github/workflows/cd-ghcr.io.yaml Outdated
@@ -34,7 +34,7 @@ jobs:
strategy:
max-parallel: 1
matrix:
container: [container3, container3lite]
container: [container3, container3lite , enterprise]
Copy link
Contributor

Choose a reason for hiding this comment

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

When we do the release, semver will create the tag, for example v3.34.0 and push the tag. Then cd-ghcr.io will deploy three images:

container3:v3.34.0
container3lite:v3.34.0
enterprise:v3.34.0

shouldn't it be just enterprise:v3.34.0? Else enterprise releases will overwrite regular releases unless we keep tags separated

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed

.github/workflows/ci-enterprise.yaml Outdated Show resolved Hide resolved
.github/workflows/ci-enterprise.yaml Outdated
- "enterprise/*"
pull_request:
branches:
- "main"
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need ci-enterprise for every PR to main? build action will build and push enterprise/pr-xx images for every PR to main

.github/workflows/ci-enterprise.yaml Show resolved Hide resolved
docs/enterprise.md
@@ -0,0 +1,26 @@
# SC4S Enterprise
Copy link
Contributor

Choose a reason for hiding this comment

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

We need the doc team review

.github/workflows/ci-enterprise.yaml Show resolved Hide resolved
@ikheifets-splunk
Copy link
Contributor

@mstopa-splunk @rjha-splunk if we will have different versions for regular and enterprise, what we will do with helm chart? Helm chart version the same that we have in docker image

@rjha-splunk rjha-splunk marked this pull request as draft January 30, 2025 10:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mbukowski-splunk mbukowski-splunk mbukowski-splunk approved these changes

@mstopa-splunk mstopa-splunk Awaiting requested review from mstopa-splunk

@ikheifets-splunk ikheifets-splunk Awaiting requested review from ikheifets-splunk

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rjha-splunk @ikheifets-splunk @mbukowski-splunk @mstopa-splunk