Skip to content

Commit e0aa2a6

Browse files
ajanikowajanikow
authored
[Feature] Move Condition Actions to Internal (#1881)
1 parent 7ca8518 commit e0aa2a6

File tree

6 files changed

+50
-14
lines changed

6 files changed

+50
-14
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- (Maintenance) Generate CRD with Schemas
1919
- (Feature) DebugPackage Improvements
2020
- (Feature) Improve Bootstrap time
21+
- (Feature) Move Condition Actions to Internal
2122

2223
## [1.2.47](https://github.com/arangodb/kube-arangodb/tree/1.2.47) (2025-03-28)
2324
- (Bugfix) Use Profile Annotations

‎docs/generated/actions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ nav_order: 11
3333
| EnableMaintenance | no | 10m0s | no | Community & Enterprise | Enable ArangoDB maintenance mode |
3434
| EnableMemberMaintenance | no | 10m0s | no | Enterprise Only | Enable ArangoDB DBServer maintenance mode |
3535
| EncryptionKeyAdd | no | 10m0s | no | Enterprise Only | Add the encryption key to the pool |
36-
| EncryptionKeyPropagated | no | 10m0s | no | Enterprise Only | Update condition of encryption propagation |
36+
| EncryptionKeyPropagated | yes | 10m0s | no | Enterprise Only | Update condition of encryption propagation |
3737
| EncryptionKeyRefresh | no | 10m0s | no | Enterprise Only | Refresh the encryption keys on member |
3838
| EncryptionKeyRemove | no | 10m0s | no | Enterprise Only | Remove the encryption key to the pool |
3939
| EncryptionKeyStatusUpdate | no | 10m0s | no | Enterprise Only | Update status of encryption propagation |
4040
| EnforceResignLeadership | no | 45m0s | yes | Community & Enterprise | Run the ResignLeadership job on DBServer and checks data compatibility after |
4141
| Idle | no | 10m0s | no | Community & Enterprise | Define idle operation in case if preconditions are not meet |
4242
| JWTAdd | no | 10m0s | no | Enterprise Only | Adds new JWT to the pool |
4343
| JWTClean | no | 10m0s | no | Enterprise Only | Remove JWT key from the pool |
44-
| JWTPropagated | no | 10m0s | no | Enterprise Only | Update condition of JWT propagation |
44+
| JWTPropagated | yes | 10m0s | no | Enterprise Only | Update condition of JWT propagation |
4545
| JWTRefresh | no | 10m0s | no | Enterprise Only | Refresh current JWT secrets on the member |
4646
| JWTSetActive | no | 10m0s | no | Enterprise Only | Change active JWT key on the cluster |
4747
| JWTStatusUpdate | no | 10m0s | no | Enterprise Only | Update status of JWT propagation |
@@ -78,22 +78,22 @@ nav_order: 11
7878
| RuntimeContainerImageUpdate | no | 10m0s | no | Community & Enterprise | Update Container Image in runtime |
7979
| RuntimeContainerSyncTolerations | no | 10m0s | no | Community & Enterprise | Update Pod Tolerations in runtime |
8080
| ~~SetCondition~~ | no | 10m0s | no | Community & Enterprise | Set deployment condition |
81-
| SetConditionV2 | no | 10m0s | no | Community & Enterprise | Set deployment condition |
81+
| SetConditionV2 | yes | 10m0s | no | Community & Enterprise | Set deployment condition |
8282
| SetCurrentImage | no | 6h0m0s | no | Community & Enterprise | Update deployment current image after image discovery |
8383
| SetCurrentMemberArch | no | 10m0s | no | Community & Enterprise | Set current member architecture |
84-
| SetMaintenanceCondition | no | 10m0s | no | Community & Enterprise | Update ArangoDB maintenance condition |
84+
| SetMaintenanceCondition | yes | 10m0s | no | Community & Enterprise | Update ArangoDB maintenance condition |
8585
| ~~SetMemberCondition~~ | no | 10m0s | no | Community & Enterprise | Set member condition |
86-
| SetMemberConditionV2 | no | 10m0s | no | Community & Enterprise | Set member condition |
86+
| SetMemberConditionV2 | yes | 10m0s | no | Community & Enterprise | Set member condition |
8787
| SetMemberCurrentImage | no | 10m0s | no | Community & Enterprise | Update Member current image |
8888
| ShutdownMember | no | 30m0s | no | Community & Enterprise | Sends Shutdown requests and waits for container to be stopped |
8989
| TLSKeyStatusUpdate | no | 10m0s | no | Enterprise Only | Update Status of TLS propagation process |
90-
| TLSPropagated | no | 10m0s | no | Enterprise Only | Update TLS propagation condition |
90+
| TLSPropagated | yes | 10m0s | no | Enterprise Only | Update TLS propagation condition |
9191
| TimezoneSecretSet | no | 30m0s | no | Community & Enterprise | Set timezone details in cluster |
9292
| TopologyDisable | no | 10m0s | no | Enterprise Only | Disable TopologyAwareness |
9393
| TopologyEnable | no | 10m0s | no | Enterprise Only | Enable TopologyAwareness |
9494
| TopologyMemberAssignment | no | 10m0s | no | Enterprise Only | Update TopologyAwareness Members assignments |
9595
| TopologyZonesUpdate | no | 10m0s | no | Enterprise Only | Update TopologyAwareness Zones info |
96-
| UpToDateUpdate | no | 10m0s | no | Community & Enterprise | Update UpToDate condition |
96+
| UpToDateUpdate | yes | 10m0s | no | Community & Enterprise | Update UpToDate condition |
9797
| UpdateTLSSNI | no | 10m0s | no | Enterprise Only | Update certificate in SNI |
9898
| UpgradeMember | no | 6h0m0s | no | Community & Enterprise | Run the Upgrade procedure on member |
9999
| WaitForMemberInSync | no | 30m0s | no | Community & Enterprise | Wait for member to be in sync. In case of DBServer waits for shards. In case of Agents to catch-up on Agency index |

‎internal/actions.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ actions:
108108
TLSPropagated:
109109
enterprise: true
110110
description: Update TLS propagation condition
111+
isInternal: true
111112
UpdateTLSSNI:
112113
enterprise: true
113114
description: Update certificate in SNI
@@ -135,6 +136,7 @@ actions:
135136
timeout: 15m
136137
UpToDateUpdate:
137138
description: Update UpToDate condition
139+
isInternal: true
138140
BackupRestore:
139141
enterprise: true
140142
description: Restore selected Backup
@@ -158,6 +160,7 @@ actions:
158160
EncryptionKeyPropagated:
159161
enterprise: true
160162
description: Update condition of encryption propagation
163+
isInternal: true
161164
JWTStatusUpdate:
162165
enterprise: true
163166
description: Update status of JWT propagation
@@ -176,6 +179,7 @@ actions:
176179
JWTPropagated:
177180
enterprise: true
178181
description: Update condition of JWT propagation
182+
isInternal: true
179183
ClusterMemberCleanup:
180184
description: Remove member from Cluster if it is gone already (Coordinators)
181185
EnableMaintenance:
@@ -184,6 +188,7 @@ actions:
184188
description: Disable ArangoDB maintenance mode
185189
SetMaintenanceCondition:
186190
description: Update ArangoDB maintenance condition
191+
isInternal: true
187192
EnableMemberMaintenance:
188193
enterprise: true
189194
description: Enable ArangoDB DBServer maintenance mode
@@ -211,6 +216,7 @@ actions:
211216
description: Set member condition
212217
scopes:
213218
- High
219+
isInternal: true
214220
SetCondition:
215221
description: Set deployment condition
216222
scopes:
@@ -220,6 +226,7 @@ actions:
220226
description: Set deployment condition
221227
scopes:
222228
- High
229+
isInternal: true
223230
MemberRIDUpdate:
224231
description: Update Run ID of member
225232
scopes:

‎pkg/apis/deployment/v1/actions.generated.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/deployment/v2alpha1/actions.generated.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/deployment/reconcile/action.register.generated_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func Test_Actions(t *testing.T) {
249249
t.Run("EncryptionKeyPropagated", func(t *testing.T) {
250250
ActionsExistence(t, api.ActionTypeEncryptionKeyPropagated)
251251
t.Run("Internal", func(t *testing.T) {
252-
require.False(t, api.ActionTypeEncryptionKeyPropagated.Internal())
252+
require.True(t, api.ActionTypeEncryptionKeyPropagated.Internal())
253253
})
254254
t.Run("Optional", func(t *testing.T) {
255255
require.False(t, api.ActionTypeEncryptionKeyPropagated.Optional())
@@ -329,7 +329,7 @@ func Test_Actions(t *testing.T) {
329329
t.Run("JWTPropagated", func(t *testing.T) {
330330
ActionsExistence(t, api.ActionTypeJWTPropagated)
331331
t.Run("Internal", func(t *testing.T) {
332-
require.False(t, api.ActionTypeJWTPropagated.Internal())
332+
require.True(t, api.ActionTypeJWTPropagated.Internal())
333333
})
334334
t.Run("Optional", func(t *testing.T) {
335335
require.False(t, api.ActionTypeJWTPropagated.Optional())
@@ -707,7 +707,7 @@ func Test_Actions(t *testing.T) {
707707
t.Run("SetConditionV2", func(t *testing.T) {
708708
ActionsExistence(t, api.ActionTypeSetConditionV2)
709709
t.Run("Internal", func(t *testing.T) {
710-
require.False(t, api.ActionTypeSetConditionV2.Internal())
710+
require.True(t, api.ActionTypeSetConditionV2.Internal())
711711
})
712712
t.Run("Optional", func(t *testing.T) {
713713
require.False(t, api.ActionTypeSetConditionV2.Optional())
@@ -737,7 +737,7 @@ func Test_Actions(t *testing.T) {
737737
t.Run("SetMaintenanceCondition", func(t *testing.T) {
738738
ActionsExistence(t, api.ActionTypeSetMaintenanceCondition)
739739
t.Run("Internal", func(t *testing.T) {
740-
require.False(t, api.ActionTypeSetMaintenanceCondition.Internal())
740+
require.True(t, api.ActionTypeSetMaintenanceCondition.Internal())
741741
})
742742
t.Run("Optional", func(t *testing.T) {
743743
require.False(t, api.ActionTypeSetMaintenanceCondition.Optional())
@@ -760,7 +760,7 @@ func Test_Actions(t *testing.T) {
760760
t.Run("SetMemberConditionV2", func(t *testing.T) {
761761
ActionsExistence(t, api.ActionTypeSetMemberConditionV2)
762762
t.Run("Internal", func(t *testing.T) {
763-
require.False(t, api.ActionTypeSetMemberConditionV2.Internal())
763+
require.True(t, api.ActionTypeSetMemberConditionV2.Internal())
764764
})
765765
t.Run("Optional", func(t *testing.T) {
766766
require.False(t, api.ActionTypeSetMemberConditionV2.Optional())
@@ -801,7 +801,7 @@ func Test_Actions(t *testing.T) {
801801
t.Run("TLSPropagated", func(t *testing.T) {
802802
ActionsExistence(t, api.ActionTypeTLSPropagated)
803803
t.Run("Internal", func(t *testing.T) {
804-
require.False(t, api.ActionTypeTLSPropagated.Internal())
804+
require.True(t, api.ActionTypeTLSPropagated.Internal())
805805
})
806806
t.Run("Optional", func(t *testing.T) {
807807
require.False(t, api.ActionTypeTLSPropagated.Optional())
@@ -861,7 +861,7 @@ func Test_Actions(t *testing.T) {
861861
t.Run("UpToDateUpdate", func(t *testing.T) {
862862
ActionsExistence(t, api.ActionTypeUpToDateUpdate)
863863
t.Run("Internal", func(t *testing.T) {
864-
require.False(t, api.ActionTypeUpToDateUpdate.Internal())
864+
require.True(t, api.ActionTypeUpToDateUpdate.Internal())
865865
})
866866
t.Run("Optional", func(t *testing.T) {
867867
require.False(t, api.ActionTypeUpToDateUpdate.Optional())

0 commit comments

Comments
 (0)