Skip to content

Commit

Permalink
Remove metrics port from backup-driver deployment
Browse files Browse the repository at this point in the history
Signed-off-by: Deepak Kinni <[email protected]>
  • Loading branch information
deepakkinni committed Jan 14, 2025
1 parent 33e0a40 commit 0d8dd16
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 22 deletions.
1 change: 0 additions & 1 deletion pkg/install/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ func Deployment(namespace string, opts ...podTemplateOption) *appsv1.Deployment
{
Name: "backup-driver",
Image: c.image,
Ports: containerPorts(),
ImagePullPolicy: pullPolicy,
Command: []string{
"/backup-driver",
Expand Down
33 changes: 12 additions & 21 deletions pkg/install/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ var CRDsList = []string{

// DefaultImage is the default image to use for the Velero deployment and restic daemonset containers.
var (
DefaultDatamgrImage = imageRegistry() + "/" + constants.DataManagerForPlugin + ":" + imageVersion()
DefaultDatamgrPodCPURequest = "0"
DefaultDatamgrPodMemRequest = "0"
DefaultDatamgrPodCPULimit = "0"
DefaultDatamgrPodMemLimit = "0"

DefaultBackupDriverImage = imageRegistry() + "/" + constants.BackupDriverForPlugin + ":" + imageVersion()
DefaultBackupDriverPodCPURequest = "0"
DefaultBackupDriverPodMemRequest = "0"
DefaultBackupDriverPodCPULimit = "0"
DefaultBackupDriverPodMemLimit = "0"
DefaultDatamgrImage = imageRegistry() + "/" + constants.DataManagerForPlugin + ":" + imageVersion()
DefaultDatamgrPodCPURequest = "0"
DefaultDatamgrPodMemRequest = "0"
DefaultDatamgrPodCPULimit = "0"
DefaultDatamgrPodMemLimit = "0"

DefaultBackupDriverImage = imageRegistry() + "/" + constants.BackupDriverForPlugin + ":" + imageVersion()
DefaultBackupDriverPodCPURequest = "0"
DefaultBackupDriverPodMemRequest = "0"
DefaultBackupDriverPodCPULimit = "0"
DefaultBackupDriverPodMemLimit = "0"
)

type PodOptions struct {
Expand All @@ -92,7 +92,7 @@ type PodOptions struct {
SecretAdd bool
MasterAffinity bool
HostNetwork bool
Features []string
Features []string
}

// Use "latest" if the build process didn't supply a version
Expand Down Expand Up @@ -124,15 +124,6 @@ func objectMeta(namespace, name string) metav1.ObjectMeta {
}
}

func containerPorts() []corev1.ContainerPort {
return []corev1.ContainerPort{
{
Name: "metrics",
ContainerPort: 8085,
},
}
}

// createResource attempts to create a resource in the cluster.
// If the resource already exists in the cluster, it's merely logged.
func createResource(r *unstructured.Unstructured, factory client.DynamicFactory, w io.Writer) error {
Expand Down

0 comments on commit 0d8dd16

Please sign in to comment.