8000 THREESCALE-9187 use standalone searchd image by eguzki · Pull Request #818 · 3scale/3scale-operator · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

THREESCALE-9187 use standalone searchd image #818

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 17 commits into from
Apr 24, 2023
Merged

THREESCALE-9187 use standalone searchd image #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3950671
use standalone searchd image
akostadinov Feb 23, 2023
bb8cf63
upgrade sphinx dc
eguzki Mar 3, 2023
852dc02
use latest tag
akostadinov Mar 25, 2023
00fa327
fix assets
eguzki Mar 30, 2023
8b73e9b
test: sphinx upgrade procedure
eguzki Apr 5, 2023
f4655af
sphinx PVC
eguzki Apr 6, 2023
77877ec
sphinx address from constant
eguzki Apr 6, 2023
d8adfb7
doc: system sphinx pvc
eguzki Apr 6, 2023
9c77e54
typo
akostadinov Apr 11, 2023
85d3a4e
system-sphinx -> system-searchd
eguzki Apr 11, 2023
02a44c8
refactor: system-sphinx -> system-searchd
eguzki Apr 11, 2023
5039bac
fix tests
eguzki Apr 11, 2023
c64e4e8
doc: system-searchd
eguzki Apr 11, 2023
1a9f0ca
update bundle
eguzki Apr 11, 2023
9451af7
fix tests
eguzki Apr 11, 2023
8000
77e3f41
upgrade system deployments reference to searchd
eguzki Apr 17, 2023
b367eea
tests: pkg/reconcilers/deploymentconfig_test.go and pkg/helper/envvar…
eguzki Apr 17, 2023
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
54 changes: 24 additions & 30 deletions apis/apps/v1alpha1/apimanager_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,13 @@ type SystemSpec struct {
AppSpec *SystemAppSpec `json:"appSpec,omitempty"`
// +optional
SidekiqSpec *SystemSidekiqSpec `json:"sidekiqSpec,omitempty"`

// +optional
// Deprecated
SphinxSpec *SystemSphinxSpec `json:"sphinxSpec,omitempty"`

// +optional
SearchdSpec *SystemSearchdSpec `json:"searchdSpec,omitempty"`
}

type SystemAppSpec struct {
Expand Down Expand Up @@ -457,6 +462,19 @@ type SystemSidekiqSpec struct {
Resources *v1.ResourceRequirements `json:"resources,omitempty"`
}

type SystemSearchdSpec struct {
// +optional
Image *string `json:"image,omitempty"`
// +optional
Affinity *v1.Affinity `json:"affinity,omitempty"`
// +optional
Tolerations []v1.Toleration `json:"tolerations,omitempty"`
// +optional
Resources *v1.ResourceRequirements `json:"resources,omitempty"`
// +optional
PVC *PVCGenericSpec `json:"persistentVolumeClaim,omitempty"`
}

type SystemSphinxSpec struct {
// +optional
Affinity *v1.Affinity `json:"affinity,omitempty"`
Expand All @@ -469,7 +487,7 @@ type SystemSphinxSpec struct {
type SystemFileStorageSpec struct {
// Union type. Only one of the fields can be set.
// +optional
PVC *SystemPVCSpec `json:"persistentVolumeClaim,omitempty"`
PVC *PVCGenericSpec `json:"persistentVolumeClaim,omitempty"`
// +optional
// Deprecated
DeprecatedS3 *DeprecatedSystemS3Spec `json:"amazonSimpleStorageService,omitempty"`
Expand All @@ -482,7 +500,7 @@ type SystemRedisPersistentVolumeClaimSpec struct {
StorageClassName *string `json:"storageClassName,omitempty"`
}

type SystemPVCSpec struct {
type PVCGenericSpec struct {
// +optional
StorageClassName *string `json:"storageClassName,omitempty"`
// Resources represents the minimum resources the volume should have.
Expand Down Expand Up @@ -532,7 +550,7 @@ type SystemMySQLSpec struct {
Image *string `json:"image,omitempty"`

// +optional
PersistentVolumeClaimSpec *SystemMySQLPVCSpec `json:"persistentVolumeClaim,omitempty"`
PersistentVolumeClaimSpec *PVCGenericSpec `json:"persistentVolumeClaim,omitempty"`
// +optional
Affinity *v1.Affinity `json:"affinity,omitempty"`
// +optional
Expand All @@ -546,7 +564,7 @@ type SystemPostgreSQLSpec struct {
Image *string `json:"image,omitempty"`

// +optional
PersistentVolumeClaimSpec *SystemPostgreSQLPVCSpec `json:"persistentVolumeClaim,omitempty"`
PersistentVolumeClaimSpec *PVCGenericSpec `json:"persistentVolumeClaim,omitempty"`
// +optional
Affinity *v1.Affinity `json:"affinity,omitempty"`
// +optional
Expand All @@ -555,30 +573,6 @@ type SystemPostgreSQLSpec struct {
Resources *v1.ResourceRequirements `json:"resources,omitempty"`
}

type SystemMySQLPVCSpec struct {
// +optional
StorageClassName *string `json:"storageClassName,omitempty"`
// Resources represents the minimum resources the volume should have.
// Ignored when VolumeName field is set
// +optional
Resources *PersistentVolumeClaimResources `json:"resources,omitempty"`
// VolumeName is the binding reference to the PersistentVolume backing this claim.
// +optional
VolumeName *string `json:"volumeName,omitempty"`
}

type SystemPostgreSQLPVCSpec struct {
// +optional
StorageClassName *string `json:"storageClassName,omitempty"`
// Resources represents the minimum resources the volume should have.
// Ignored when VolumeName field is set
// +optional
Resources *PersistentVolumeClaimResources `json:"resources,omitempty"`
// VolumeName is the binding reference to the PersistentVolume backing this claim.
// +optional
VolumeName *string `json:"volumeName,omitempty"`
}

type ZyncSpec struct {
// +optional
Image *string `json:"image,omitempty"`
Expand Down Expand Up @@ -874,8 +868,8 @@ func (apimanager *APIManager) setSystemSpecDefaults() (bool, error) {
changed = true
}

if spec.System.SphinxSpec == nil {
spec.System.SphinxSpec = &SystemSphinxSpec{}
if spec.System.SearchdSpec == nil {
spec.System.SearchdSpec = &SystemSearchdSpec{}
changed = true
}

Expand Down
2 changes: 1 addition & 1 deletion apis/apps/v1alpha1/apimanager_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestSetDefaults(t *testing.T) {
System: &SystemSpec{
AppSpec: &SystemAppSpec{},
SidekiqSpec: &SystemSidekiqSpec{},
SphinxSpec: &SystemSphinxSpec{},
SearchdSpec: &SystemSearchdSpec{},
},
Zync: &ZyncSpec{
AppSpec: &ZyncAppSpec{},
Expand Down
173 changes: 80 additions & 93 deletions apis/apps/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
0