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

Deploy two init-containers and rename restic to node-agent #338

Closed
wants to merge 22 commits into from
Closed

Deploy two init-containers and rename restic to node-agent #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c060032
Deploy velero-crds and velero secret
kumarkgosa Aug 4, 2023
2bbec9e
Merge branch 'application-mobility' into velero-kar
kumarkgosa Aug 4, 2023
8b0726e
resolve conflicts
kumarkgosa Aug 4, 2023
06d6d67
Merge branch 'velero-kar' of https://github.com/dell/csm-operator int…
kumarkgosa Aug 4, 2023
163b892
formatting and linting
kumarkgosa Aug 4, 2023
a5c8c29
Merge branch 'application-mobility' into velero-kar
jooseppi-luna Aug 7, 2023
9c6979c
resolve main-branch conflicts
kumarkgosa Aug 7, 2023
510c7ad
code cleanup and working secret automation with real data
kumarkgosa Aug 10, 2023
3b71970
Merge branch 'application-mobility' into velero-kar
kumarkgosa Aug 10, 2023
db86c36
Update application_mobility.go
kumarkgosa Aug 10, 2023
11c27a4
changed fmt error to log error
kumarkgosa Aug 10, 2023
c506731
use fmt print instead error
kumarkgosa Aug 10, 2023
c464ba1
Restic changes and update e2e yamls
kumarkgosa Aug 16, 2023
fcca5f7
minor correction in test yaml
kumarkgosa Aug 16, 2023
8dfc9ee
working e2e and support restic again
kumarkgosa Aug 23, 2023
f87aa3a
resolve conflicts
kumarkgosa Aug 24, 2023
3f7125b
Update alt-velero-secret.yaml
kumarkgosa Aug 24, 2023
0fcd668
Update application_mobility.go
kumarkgosa Aug 24, 2023
05b0c8e
Removing duplicate test scenario
kumarkgosa Aug 24, 2023
10fd7a5
resolve merge conflict
kumarkgosa Aug 24, 2023
cf1829f
Deploy two init-containers and rename restic to node-agent
kumarkgosa Aug 29, 2023
03de14d
Fix unit-tests
kumarkgosa Aug 29, 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
6 changes: 3 additions & 3 deletions api/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
Sdcmonitor = "sdc-monitor"
// Externalhealthmonitor - placeholder for constant
Externalhealthmonitor = "external-health-monitor"
//Sdc - placeholder for constant

Check failure on line 106 in api/v1/types.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

File is not `gofumpt`-ed (gofumpt)
Sdc = "sdc"

// EventDeleted - Deleted in event recorder
Expand Down Expand Up @@ -229,7 +229,7 @@

// ContainerTemplate template
type ContainerTemplate struct {

Check failure on line 232 in api/v1/types.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

File is not `gofumpt`-ed (gofumpt)
// Name is the name of Container
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Container Name"
Name string `json:"name,omitempty" yaml:"name,omitempty"`
Expand Down Expand Up @@ -311,21 +311,21 @@
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Application Mobility Object Store Secret"
ObjectStoreSecretName string `json:"objectStoreSecretName,omitempty" yaml:"objectStoreSecretName,omitempty"`

//UseSnapshot is to check whether volume snapshot is enabled under velero component

Check failure on line 314 in api/v1/types.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

File is not `gofumpt`-ed (gofumpt)
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="use-volume-snapshots for Application Mobilit- Velero"
UseSnapshot bool `json:"useVolumeSnapshot,omitempty" yaml:"useVolumeSnapshot,omitempty"`

//CleanUpCRDs is to check whether customer wants to clean up velero crds

Check failure on line 318 in api/v1/types.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

File is not `gofumpt`-ed (gofumpt)
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="cleanUpCRDs for Application Mobility - Velero"
CleanUpCRDs bool `json:"cleanUpCRDs,omitempty" yaml:"cleanUpCRDs,omitempty"`

//ComponentCred is to store the velero credential contents

Check failure on line 322 in api/v1/types.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

File is not `gofumpt`-ed (gofumpt)
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="ComponentCred for velero component"
ComponentCred []Credential `json:"credentials,omitempty" yaml:"credentials,omitempty"`

//DeployRestic is to enable/disable restic services
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Deploy Restic for Application Mobility"
DeployRestic bool `json:"deployRestic,omitempty" yaml:"deployRestic,omitempty"`
//DeployNodeAgent is to enable/disable node-agent services

Check failure on line 326 in api/v1/types.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

File is not `gofumpt`-ed (gofumpt)
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Deploy node-agent for Application Mobility"
DeployNodeAgent bool `json:"deployNodeAgent,omitempty" yaml:"deployNodeAgent,omitempty"`
}

// SnapshotClass struct
Expand Down
33 changes: 19 additions & 14 deletions config/crd/bases/storage.dell.com_containerstoragemodules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,9 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent
services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to
Expand Down Expand Up @@ -378,8 +379,9 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent
services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to
Expand Down Expand Up @@ -670,8 +672,9 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent
services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to
Expand Down Expand Up @@ -940,8 +943,9 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent
services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to
Expand Down Expand Up @@ -1213,8 +1217,9 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent
services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to
Expand Down Expand Up @@ -1512,8 +1517,8 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent
services
type: boolean
enabled:
Expand Down Expand Up @@ -1801,8 +1806,8 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent
services
type: boolean
enabled:
Expand Down
28 changes: 14 additions & 14 deletions deploy/crds/storage.dell.com_containerstoragemodules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to deploy a module
Expand Down Expand Up @@ -291,8 +291,8 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to deploy a module
Expand Down Expand Up @@ -510,8 +510,8 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to deploy a module
Expand Down Expand Up @@ -708,8 +708,8 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to deploy a module
Expand Down Expand Up @@ -911,8 +911,8 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to deploy a module
Expand Down Expand Up @@ -1135,8 +1135,8 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to deploy a module
Expand Down Expand Up @@ -1344,8 +1344,8 @@ spec:
type: object
type: object
type: array
deployRestic:
description: DeployRestic is to enable/disable restic services
deployNodeAgent:
description: DeployNodeAgent is to enable/disable node-agent services
type: boolean
enabled:
description: Enabled is used to indicate wether or not to deploy a module
Expand Down
11 changes: 5 additions & 6 deletions ...g/application-mobility/v0.3.0/restic.yaml → ...plication-mobility/v0.3.0/node-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: node-agent
name: application-mobility-node-agent
namespace: <VELERO_NAMESPACE>
labels:
app.kubernetes.io/name: application-mobility-velero
app.kubernetes.io/instance: application-mobility
spec:
selector:
matchLabels:
name: node-agent
name: application-mobility-node-agent
template:
metadata:
labels:
name: node-agent
name: application-mobility-node-agent
app.kubernetes.io/name: application-mobility-velero
app.kubernetes.io/instance: application-mobility
spec:
serviceAccountName: application-mobility-velero-server-service-account
#terminationGracePeriodSeconds: 3600
terminationGracePeriodSeconds: 3600
volumes:
- name: cloud-credentials
secret:
Expand All @@ -28,7 +28,7 @@ spec:
path: /var/lib/kubelet/pods
- name: scratch
emptyDir: {}
#dnsPolicy: ClusterFirst
dnsPolicy: ClusterFirst
securityContext:
runAsUser: 0
containers:
Expand Down Expand Up @@ -70,4 +70,3 @@ spec:
limits:
cpu: 2000m
memory: 2024Mi
---
13 changes: 9 additions & 4 deletions operatorconfig/moduleconfig/application-mobility/v0.3.0/velero-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ spec:
volumeMounts:
- name: plugins
mountPath: /plugins
- name: <APPLICATION_MOBILITY_OBJECT_STORE_SECRET_NAME>
- name: cloud-credentials
mountPath: /credentials
- name: scratch
mountPath: /scratch
Expand All @@ -172,13 +172,18 @@ spec:
lifecycle:
dnsPolicy: ClusterFirst
initContainers:
- name: <INIT_CONTAINER_NAME>
image: <INIT_CONTAINER_IMAGE>
- name: <AWS_INIT_CONTAINER_NAME>
image: <AWS_INIT_CONTAINER_IMAGE>
volumeMounts:
- mountPath: /target
name: plugins
- name: <DELL_INIT_CONTAINER_NAME>
image: <DELL_INIT_CONTAINER_IMAGE>
volumeMounts:
- mountPath: /target
name: plugins
volumes:
- name: <APPLICATION_MOBILITY_OBJECT_STORE_SECRET_NAME>
- name: cloud-credentials
secret:
secretName: <APPLICATION_MOBILITY_OBJECT_STORE_SECRET_NAME>
- name: plugins
Expand Down
Loading
Loading