Skip to content

Fork Sync: Update from parent repository #73

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
kaovilai merged 1 commit into from
Jan 3, 2023
Merged

Fork Sync: Update from parent repository #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion bundle/manifests/oadp-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,6 @@ spec:
- security.openshift.io
resourceNames:
- privileged
- velero-privileged
resources:
- securitycontextconstraints
verbs:
Expand Down
1 change: 0 additions & 1 deletion config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ rules:
- use
resourceNames:
- privileged
- velero-privileged
- apiGroups:
- ""
resources:
Expand Down
1 change: 0 additions & 1 deletion controllers/dpa_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ func (r *DPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R

_, err := ReconcileBatch(r.Log,
r.ValidateDataProtectionCR,
r.ReconcileVeleroSecurityContextConstraint,
r.ReconcileResticRestoreHelperConfig,
r.ValidateBackupStorageLocations,
r.ReconcileBackupStorageLocations,
Expand Down
95 changes: 0 additions & 95 deletions controllers/velero.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
//"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/go-logr/logr"
security "github.com/openshift/api/security/v1"
oadpv1alpha1 "github.com/openshift/oadp-operator/api/v1alpha1"
"github.com/openshift/oadp-operator/pkg/common"
"github.com/vmware-tanzu/velero/pkg/install"
Expand Down Expand Up @@ -203,54 +202,6 @@ func (r *DPAReconciler) ReconcileVeleroClusterRoleBinding(log logr.Logger) (bool
return true, nil
}

func (r *DPAReconciler) ReconcileVeleroSecurityContextConstraint(log logr.Logger) (bool, error) {
dpa := oadpv1alpha1.DataProtectionApplication{}
if err := r.Get(r.Context, r.NamespacedName, &dpa); err != nil {
return false, err
}
sa := corev1.ServiceAccount{}
nsName := types.NamespacedName{
Namespace: dpa.Namespace,
Name: common.Velero,
}
if err := r.Get(r.Context, nsName, &sa); err != nil {
return false, err
}

veleroSCC := &security.SecurityContextConstraints{
ObjectMeta: metav1.ObjectMeta{
Name: "velero-privileged",
},
}
op, err := controllerutil.CreateOrPatch(r.Context, r.Client, veleroSCC, func() error {
// Setting controller owner reference on the velero SCC
// TODO: HOW DO I DO THIS?? ALAY HALP PLZ
/*err := controllerutil.SetControllerReference(&velero, veleroSCC, r.Scheme)
if err != nil {
return err
}*/

// update the SCC template
return r.privilegedSecurityContextConstraints(veleroSCC, &dpa, &sa)
})

if err != nil {
return false, err
}

//TODO: Review velero SCC status and report errors and conditions

if op == controllerutil.OperationResultCreated || op == controllerutil.OperationResultUpdated {
// Trigger event to indicate velero SCC was created or updated
r.EventRecorder.Event(veleroSCC,
corev1.EventTypeNormal,
"VeleroSecurityContextConstraintsReconciled",
fmt.Sprintf("performed %s on velero scc %s", op, veleroSCC.Name),
)
}
return true, nil
}

func (r *DPAReconciler) ReconcileVeleroDeployment(log logr.Logger) (bool, error) {
dpa := oadpv1alpha1.DataProtectionApplication{}
if err := r.Get(r.Context, r.NamespacedName, &dpa); err != nil {
Expand Down Expand Up @@ -326,52 +277,6 @@ func (r *DPAReconciler) veleroClusterRoleBinding(dpa *oadpv1alpha1.DataProtectio
return crb, nil
}

func (r *DPAReconciler) privilegedSecurityContextConstraints(scc *security.SecurityContextConstraints, dpa *oadpv1alpha1.DataProtectionApplication, sa *corev1.ServiceAccount) error {
// ObjectMeta set from prior step.

scc.AllowHostDirVolumePlugin = true
scc.AllowHostIPC = true
scc.AllowHostNetwork = true
scc.AllowHostPID = true
scc.AllowHostPorts = true
scc.AllowPrivilegeEscalation = pointer.BoolPtr(true)
scc.AllowPrivilegedContainer = true
scc.AllowedCapabilities = []corev1.Capability{
security.AllowAllCapabilities,
}
scc.AllowedUnsafeSysctls = []string{
"*",
}
scc.DefaultAddCapabilities = nil
scc.FSGroup = security.FSGroupStrategyOptions{
Type: security.FSGroupStrategyRunAsAny,
}
scc.Priority = nil
scc.ReadOnlyRootFilesystem = false
scc.RequiredDropCapabilities = nil
scc.RunAsUser = security.RunAsUserStrategyOptions{
Type: security.RunAsUserStrategyRunAsAny,
}
scc.SELinuxContext = security.SELinuxContextStrategyOptions{
Type: security.SELinuxStrategyRunAsAny,
}
scc.SeccompProfiles = []string{
"*",
}
scc.SupplementalGroups = security.SupplementalGroupsStrategyOptions{
Type: security.SupplementalGroupsStrategyRunAsAny,
}
scc.Users = []string{
"system:admin",
fmt.Sprintf("system:serviceaccount:%s:%s", sa.Namespace, sa.Name),
}
scc.Volumes = []security.FSType{
security.FSTypeAll,
}

return nil
}

// Build VELERO Deployment
func (r *DPAReconciler) buildVeleroDeployment(veleroDeployment *appsv1.Deployment, dpa *oadpv1alpha1.DataProtectionApplication) error {

Expand Down