Skip to content

CSPL-1207: Remove liveness and readiness from App spec #454

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

Merged
merged 2 commits into from
Aug 7, 2021
Merged

CSPL-1207: Remove liveness and readiness from App spec #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aaf72f
CSPL-1207: Remove liveness and readiness from App spec
tpereirasplunk Aug 7, 2021
d076034
Merge branch 'develop' into CSPL-1207
smohan-splunk Aug 7, 2021
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
8 changes: 4 additions & 4 deletions test/c3/appframework/appframework_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ var _ = Describe("c3appfw test", func() {
})

// Commenting this test for now as ES app is not installed locally on Deployer anymore before bundle push due to change from CSPL-1167
XContext("Clustered deployment (C3 - clustered indexer, search head cluster)", func() {
Context("Clustered deployment (C3 - clustered indexer, search head cluster)", func() {
It("appfwint, c3, appframework: can deploy a C3 SVA and have ES app installed on SHC", func() {

// ES is a huge file, we configure it here rather than in BeforeSuite/BeforeEach to save time for other tests
Expand All @@ -352,7 +352,7 @@ var _ = Describe("c3appfw test", func() {

appSourceDefaultSpec := enterpriseApi.AppSourceDefaultSpec{
VolName: volumeName,
Scope: enterpriseApi.ScopeCluster,
Scope: enterpriseApi.ScopeClusterWithPreConfig,
}
appSourceName := "appframework-" + testenv.RandomDNSName(3)
appSourceSpec := []enterpriseApi.AppSourceSpec{testenv.GenerateAppSourceSpec(appSourceName, s3TestDir, appSourceDefaultSpec)}
Expand Down Expand Up @@ -386,8 +386,8 @@ var _ = Describe("c3appfw test", func() {
ClusterMasterRef: corev1.ObjectReference{
Name: deployment.GetName(),
},
LivenessInitialDelaySeconds: 1450,
ReadinessInitialDelaySeconds: 1450,
// LivenessInitialDelaySeconds: 1450,
// ReadinessInitialDelaySeconds: 1450,
},
Replicas: 3,
AppFrameworkConfig: appFrameworkSpec,
Expand Down
8 changes: 4 additions & 4 deletions test/s1/appframework/appframework_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ var _ = Describe("s1appfw test", func() {

appSourceDefaultSpec := enterpriseApi.AppSourceDefaultSpec{
VolName: volumeName,
Scope: enterpriseApi.ScopeLocal,
Scope: enterpriseApi.ScopeClusterWithPreConfig,
}
appSourceName := "appframework-" + testenv.RandomDNSName(3)
appSourceSpec := []enterpriseApi.AppSourceSpec{testenv.GenerateAppSourceSpec(appSourceName, s3TestDir, appSourceDefaultSpec)}
Expand All @@ -219,9 +219,9 @@ var _ = Describe("s1appfw test", func() {
Spec: splcommon.Spec{
ImagePullPolicy: "Always",
},
Volumes: []corev1.Volume{},
LivenessInitialDelaySeconds: 600,
ReadinessInitialDelaySeconds: 660,
Volumes: []corev1.Volume{},
// LivenessInitialDelaySeconds: 600,
// ReadinessInitialDelaySeconds: 660,
},
AppFrameworkConfig: appFrameworkSpec,
}
Expand Down
20 changes: 10 additions & 10 deletions test/testenv/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,8 +589,8 @@ func (d *Deployment) DeploySingleSiteClusterWithGivenAppFrameworkSpec(name strin
LicenseMasterRef: corev1.ObjectReference{
Name: licenseMaster,
},
LivenessInitialDelaySeconds: int32(delaySeconds),
ReadinessInitialDelaySeconds: int32(delaySeconds),
// LivenessInitialDelaySeconds: int32(delaySeconds),
// ReadinessInitialDelaySeconds: int32(delaySeconds),
},
AppFrameworkConfig: appFrameworkSpec,
}
Expand All @@ -617,8 +617,8 @@ func (d *Deployment) DeploySingleSiteClusterWithGivenAppFrameworkSpec(name strin
LicenseMasterRef: corev1.ObjectReference{
Name: licenseMaster,
},
LivenessInitialDelaySeconds: int32(delaySeconds),
ReadinessInitialDelaySeconds: int32(delaySeconds),
// LivenessInitialDelaySeconds: int32(delaySeconds),
// ReadinessInitialDelaySeconds: int32(delaySeconds),
},
Replicas: 3,
AppFrameworkConfig: appFrameworkSpec,
Expand Down Expand Up @@ -673,9 +673,9 @@ func (d *Deployment) DeployMultisiteClusterWithSearchHeadAndAppFramework(name st
LicenseMasterRef: corev1.ObjectReference{
Name: licenseMaster,
},
Defaults: defaults,
LivenessInitialDelaySeconds: int32(delaySeconds),
ReadinessInitialDelaySeconds: int32(delaySeconds),
Defaults: defaults,
// LivenessInitialDelaySeconds: int32(delaySeconds),
// ReadinessInitialDelaySeconds: int32(delaySeconds),
},
AppFrameworkConfig: appFrameworkSpec,
}
Expand Down Expand Up @@ -715,9 +715,9 @@ func (d *Deployment) DeployMultisiteClusterWithSearchHeadAndAppFramework(name st
LicenseMasterRef: corev1.ObjectReference{
Name: licenseMaster,
},
Defaults: siteDefaults,
LivenessInitialDelaySeconds: int32(delaySeconds),
ReadinessInitialDelaySeconds: int32(delaySeconds),
Defaults: siteDefaults,
// LivenessInitialDelaySeconds: int32(delaySeconds),
// ReadinessInitialDelaySeconds: int32(delaySeconds),
},
Replicas: 3,
AppFrameworkConfig: appFrameworkSpec,
Expand Down