Skip to content

Commit 560afff

Browse files
committed
[EPMDEDP-11690]: feat: Added ability to set constant requeue time in GroupMember Reconciler
Change-Id: Ibb19aa45122639dd6e3a6792e43701b69ce38e54
1 parent a9fd39f commit 560afff

18 files changed

+365
-213
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV OPERATOR=/usr/local/bin/gerrit-operator \
77

88
RUN apk add --no-cache ca-certificates=20220614-r0 \
99
openssh-client==9.0_p1-r2 \
10-
git==2.36.4-r0
10+
git==2.36.5-r0
1111

1212
# install operator binary
1313
COPY ./dist/go-binary ${OPERATOR}

deploy-templates/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ A Helm chart for EDP Gerrit Operator
5454
| global.gerritSSHPort | string | `"30022"` | Gerrit SSH node port |
5555
| global.openshift.deploymentType | string | `"deployments"` | Which type of kind will be deployed to Openshift (values: deployments/deploymentConfigs) |
5656
| global.platform | string | `"openshift"` | platform type that can be "kubernetes" or "openshift" |
57+
| groupMemberSyncInterval | string | `"30m"` | If not defined the exponential formula with the max value of 1hr will be used |
5758
| image.repository | string | `"epamedp/gerrit-operator"` | EDP gerrit-operator Docker image name. The released image can be found on [Dockerhub](https://hub.docker.com/r/epamedp/gerrit-operator) |
5859
| image.tag | string | `nil` | EDP gerrit-operator Docker image tag. The released image can be found on [Dockerhub](https://hub.docker.com/r/epamedp/gerrit-operator/tags) |
5960
| imagePullPolicy | string | `"IfNotPresent"` | |

deploy-templates/crds/v2.edp.epam.com_gerritgroupmembers.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: gerritgroupmembers.v2.edp.epam.com
99
spec:
@@ -18,7 +18,7 @@ spec:
1818
- name: v1
1919
schema:
2020
openAPIV3Schema:
21-
description: GerritGroupMember is the Schema for the gerrit group member API
21+
description: GerritGroupMember is the Schema for the gerrit group member API.
2222
properties:
2323
apiVersion:
2424
description: 'APIVersion defines the versioned schema of this representation
@@ -33,7 +33,7 @@ spec:
3333
metadata:
3434
type: object
3535
spec:
36-
description: GerritGroupMemberSpec defines the desired state of GerritGroupMember
36+
description: GerritGroupMemberSpec defines the desired state of GerritGroupMember.
3737
properties:
3838
accountId:
3939
type: string
@@ -49,7 +49,7 @@ spec:
4949
- groupId
5050
type: object
5151
status:
52-
description: GerritGroupMemberStatus defines the observed state of GerritGroupMember
52+
description: GerritGroupMemberStatus defines the observed state of GerritGroupMember.
5353
properties:
5454
failureCount:
5555
description: Preserves Number of Failures during reconciliation phase.
@@ -68,7 +68,7 @@ spec:
6868
name: v1alpha1
6969
schema:
7070
openAPIV3Schema:
71-
description: GerritGroupMember is the Schema for the gerrit group member API
71+
description: GerritGroupMember is the Schema for the gerrit group member API.
7272
properties:
7373
apiVersion:
7474
description: 'APIVersion defines the versioned schema of this representation
@@ -83,7 +83,7 @@ spec:
8383
metadata:
8484
type: object
8585
spec:
86-
description: GerritGroupMemberSpec defines the desired state of GerritGroupMember
86+
description: GerritGroupMemberSpec defines the desired state of GerritGroupMember.
8787
properties:
8888
accountId:
8989
type: string
@@ -99,7 +99,7 @@ spec:
9999
- groupId
100100
type: object
101101
status:
102-
description: GerritGroupMemberStatus defines the observed state of GerritGroupMember
102+
description: GerritGroupMemberStatus defines the observed state of GerritGroupMember.
103103
properties:
104104
value:
105105
type: string

deploy-templates/crds/v2.edp.epam.com_gerritgroups.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: gerritgroups.v2.edp.epam.com
99
spec:
@@ -18,7 +18,7 @@ spec:
1818
- name: v1
1919
schema:
2020
openAPIV3Schema:
21-
description: GerritGroup is the Schema for the gerrit group API
21+
description: GerritGroup is the Schema for the gerrit group API.
2222
properties:
2323
apiVersion:
2424
description: 'APIVersion defines the versioned schema of this representation
@@ -33,7 +33,7 @@ spec:
3333
metadata:
3434
type: object
3535
spec:
36-
description: GerritGroupSpec defines the desired state of GerritGroup
36+
description: GerritGroupSpec defines the desired state of GerritGroup.
3737
properties:
3838
description:
3939
type: string
@@ -47,7 +47,7 @@ spec:
4747
- name
4848
type: object
4949
status:
50-
description: GerritGroupStatus defines the observed state of GerritGroup
50+
description: GerritGroupStatus defines the observed state of GerritGroup.
5151
properties:
5252
groupId:
5353
type: string
@@ -65,7 +65,7 @@ spec:
6565
name: v1alpha1
6666
schema:
6767
openAPIV3Schema:
68-
description: GerritGroup is the Schema for the gerrit group API
68+
description: GerritGroup is the Schema for the gerrit group API.
6969
properties:
7070
apiVersion:
7171
description: 'APIVersion defines the versioned schema of this representation
@@ -80,7 +80,7 @@ spec:
8080
metadata:
8181
type: object
8282
spec:
83-
description: GerritGroupSpec defines the desired state of GerritGroup
83+
description: GerritGroupSpec defines the desired state of GerritGroup.
8484
properties:
8585
description:
8686
type: string
@@ -94,7 +94,7 @@ spec:
9494
- name
9595
type: object
9696
status:
97-
description: GerritGroupStatus defines the observed state of GerritGroup
97+
description: GerritGroupStatus defines the observed state of GerritGroup.
9898
properties:
9999
groupId:
100100
type: string

deploy-templates/crds/v2.edp.epam.com_gerritmergerequests.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: gerritmergerequests.v2.edp.epam.com
99
spec:
@@ -19,7 +19,7 @@ spec:
1919
schema:
2020
openAPIV3Schema:
2121
description: GerritMergeRequest is the Schema for the gerrit merge request
22-
API
22+
API.
2323
properties:
2424
apiVersion:
2525
description: 'APIVersion defines the versioned schema of this representation
@@ -34,7 +34,7 @@ spec:
3434
metadata:
3535
type: object
3636
spec:
37-
description: GerritMergeRequestSpec defines the desired state of GerritMergeRequest
37+
description: GerritMergeRequestSpec defines the desired state of GerritMergeRequest.
3838
properties:
3939
additionalArguments:
4040
description: AdditionalArguments contains merge command additional
@@ -71,7 +71,7 @@ spec:
7171
- projectName
7272
type: object
7373
status:
74-
description: GerritMergeRequestStatus defines the observed state of GerritMergeRequest
74+
description: GerritMergeRequestStatus defines the observed state of GerritMergeRequest.
7575
properties:
7676
changeId:
7777
type: string
@@ -90,7 +90,7 @@ spec:
9090
schema:
9191
openAPIV3Schema:
9292
description: GerritMergeRequest is the Schema for the gerrit merge request
93-
API
93+
API.
9494
properties:
9595
apiVersion:
9696
description: 'APIVersion defines the versioned schema of this representation
@@ -105,7 +105,7 @@ spec:
105105
metadata:
106106
type: object
107107
spec:
108-
description: GerritMergeRequestSpec defines the desired state of GerritMergeRequest
108+
description: GerritMergeRequestSpec defines the desired state of GerritMergeRequest.
109109
properties:
110110
additionalArguments:
111111
description: AdditionalArguments contains merge command additional
@@ -142,7 +142,7 @@ spec:
142142
- projectName
143143
type: object
144144
status:
145-
description: GerritMergeRequestStatus defines the observed state of GerritMergeRequest
145+
description: GerritMergeRequestStatus defines the observed state of GerritMergeRequest.
146146
properties:
147147
changeId:
148148
type: string

deploy-templates/crds/v2.edp.epam.com_gerritprojectaccesses.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: gerritprojectaccesses.v2.edp.epam.com
99
spec:
@@ -19,7 +19,7 @@ spec:
1919
schema:
2020
openAPIV3Schema:
2121
description: GerritProjectAccess is the Schema for the gerrit project access
22-
API
22+
API.
2323
properties:
2424
apiVersion:
2525
description: 'APIVersion defines the versioned schema of this representation
@@ -34,7 +34,7 @@ spec:
3434
metadata:
3535
type: object
3636
spec:
37-
description: GerritProjectAccessSpec defines the desired state of GerritProjectAccess
37+
description: GerritProjectAccessSpec defines the desired state of GerritProjectAccess.
3838
properties:
3939
ownerName:
4040
description: OwnerName indicates which gerrit CR should be taken to
@@ -78,7 +78,7 @@ spec:
7878
- projectName
7979
type: object
8080
status:
81-
description: GerritProjectAccessStatus defines the observed state of GerritProjectAccess
81+
description: GerritProjectAccessStatus defines the observed state of GerritProjectAccess.
8282
properties:
8383
created:
8484
type: boolean
@@ -95,7 +95,7 @@ spec:
9595
schema:
9696
openAPIV3Schema:
9797
description: GerritProjectAccess is the Schema for the gerrit project access
98-
API
98+
API.
9999
properties:
100100
apiVersion:
101101
description: 'APIVersion defines the versioned schema of this representation
@@ -110,7 +110,7 @@ spec:
110110
metadata:
111111
type: object
112112
spec:
113-
description: GerritProjectAccessSpec defines the desired state of GerritProjectAccess
113+
description: GerritProjectAccessSpec defines the desired state of GerritProjectAccess.
114114
properties:
115115
ownerName:
116116
description: OwnerName indicates which gerrit CR should be taken to
@@ -154,7 +154,7 @@ spec:
154154
- projectName
155155
type: object
156156
status:
157-
description: GerritProjectAccessStatus defines the observed state of GerritProjectAccess
157+
description: GerritProjectAccessStatus defines the observed state of GerritProjectAccess.
158158
properties:
159159
created:
160160
type: boolean

deploy-templates/crds/v2.edp.epam.com_gerritprojects.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: gerritprojects.v2.edp.epam.com
99
spec:
@@ -18,7 +18,7 @@ spec:
1818
- name: v1
1919
schema:
2020
openAPIV3Schema:
21-
description: GerritProject is the Schema for the gerrit project API
21+
description: GerritProject is the Schema for the gerrit project API.
2222
properties:
2323
apiVersion:
2424
description: 'APIVersion defines the versioned schema of this representation
@@ -33,7 +33,7 @@ spec:
3333
metadata:
3434
type: object
3535
spec:
36-
description: GerritProjectSpec defines the desired state of GerritProject
36+
description: GerritProjectSpec defines the desired state of GerritProject.
3737
properties:
3838
branches:
3939
type: string
@@ -59,7 +59,7 @@ spec:
5959
- name
6060
type: object
6161
status:
62-
description: GerritProjectStatus defines the observed state of GerritProject
62+
description: GerritProjectStatus defines the observed state of GerritProject.
6363
properties:
6464
branches:
6565
items:
@@ -78,7 +78,7 @@ spec:
7878
name: v1alpha1
7979
schema:
8080
openAPIV3Schema:
81-
description: GerritProject is the Schema for the gerrit project API
81+
description: GerritProject is the Schema for the gerrit project API.
8282
properties:
8383
apiVersion:
8484
description: 'APIVersion defines the versioned schema of this representation
@@ -93,7 +93,7 @@ spec:
9393
metadata:
9494
type: object
9595
spec:
96-
description: GerritProjectSpec defines the desired state of GerritProject
96+
description: GerritProjectSpec defines the desired state of GerritProject.
9797
properties:
9898
branches:
9999
type: string
@@ -119,7 +119,7 @@ spec:
119119
- name
120120
type: object
121121
status:
122-
description: GerritProjectStatus defines the observed state of GerritProject
122+
description: GerritProjectStatus defines the observed state of GerritProject.
123123
properties:
124124
branches:
125125
items:

deploy-templates/crds/v2.edp.epam.com_gerritreplicationconfigs.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.0
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: gerritreplicationconfigs.v2.edp.epam.com
99
spec:
@@ -19,7 +19,7 @@ spec:
1919
schema:
2020
openAPIV3Schema:
2121
description: GerritReplicationConfig is the Schema for the gerrit replication
22-
config API
22+
config API.
2323
properties:
2424
apiVersion:
2525
description: 'APIVersion defines the versioned schema of this representation
@@ -35,7 +35,7 @@ spec:
3535
type: object
3636
spec:
3737
description: GerritReplicationConfigSpec defines the desired state of
38-
GerritReplicationConfig
38+
GerritReplicationConfig.
3939
properties:
4040
owner_name:
4141
type: string
@@ -46,7 +46,7 @@ spec:
4646
type: object
4747
status:
4848
description: GerritReplicationConfigStatus defines the observed state
49-
of GerritReplicationConfig
49+
of GerritReplicationConfig.
5050
properties:
5151
available:
5252
type: boolean
@@ -66,7 +66,7 @@ spec:
6666
schema:
6767
openAPIV3Schema:
6868
description: GerritReplicationConfig is the Schema for the gerritreplicationconfigs
69-
API
69+
API.
7070
properties:
7171
apiVersion:
7272
description: 'APIVersion defines the versioned schema of this representation
@@ -82,7 +82,7 @@ spec:
8282
type: object
8383
spec:
8484
description: GerritReplicationConfigSpec defines the desired state of
85-
GerritReplicationConfig
85+
GerritReplicationConfig.
8686
properties:
8787
owner_name:
8888
type: string
@@ -93,7 +93,7 @@ spec:
9393
type: object
9494
status:
9595
description: GerritReplicationConfigStatus defines the observed state
96-
of GerritReplicationConfig
96+
of GerritReplicationConfig.
9797
properties:
9898
available:
9999
type: boolean

0 commit comments

Comments
 (0)