Skip to content

fix(controller): added entry type check #2

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
merged 1 commit into from
Feb 2, 2023
Merged

fix(controller): added entry type check #2

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
6 changes: 6 additions & 0 deletions config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
resources:
- manager.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: devolutions/devolutions-kubernetes-operator
newTag: latest
4 changes: 2 additions & 2 deletions config/rbac/auth_proxy_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/name: service
app.kubernetes.io/instance: controller-manager-metrics-service
app.kubernetes.io/instance: ctrl-mgr-metrics-service
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: devolutions-kubernetes-operator
app.kubernetes.io/part-of: devolutions-kubernetes-operator
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-service
name: ctrl-mgr-metrics-service
namespace: system
spec:
ports:
Expand Down
2 changes: 0 additions & 2 deletions config/samples/dvls_v1alpha1_dvlssecret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ metadata:
spec:
# TODO(user): Add fields here
entryId: (entry id)
secretName: test-dvls-secret
namespace: default
21 changes: 20 additions & 1 deletion controllers/dvlssecret_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,28 @@ func (r *DvlsSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request)
}
}

entry, err := DvlsClient.GetEntry(dvlsSecret.Spec.EntryID)
if err != nil {
log.Error(err, "unable to fetch dvls entry", "entryId", dvlsSecret.Spec.EntryID)
meta.SetStatusCondition(&dvlsSecret.Status.Conditions, v1.Condition{Type: statusDegradedDvlsSecret, Status: v1.ConditionTrue, Reason: "Reconciling", Message: "Unable to fetch entry on DVLS instance"})
if err := r.Status().Update(ctx, dvlsSecret); err != nil {
log.Error(err, "Failed to update DvlsSecret status")
}
return ctrl.Result{}, nil
}

if entry.ConnectionType != dvls.ServerConnectionCredential || entry.ConnectionSubType != dvls.ServerConnectionSubTypeDefault {
log.Error(err, "entry type not supported, only username/password entries are supported", "entryId", dvlsSecret.Spec.EntryID, "entryType", entry.ConnectionType, "entrySubType", entry.ConnectionSubType)
meta.SetStatusCondition(&dvlsSecret.Status.Conditions, v1.Condition{Type: statusDegradedDvlsSecret, Status: v1.ConditionTrue, Reason: "Reconciling", Message: "Entry type not supported, only username/password entries are supported"})
if err := r.Status().Update(ctx, dvlsSecret); err != nil {
log.Error(err, "Failed to update DvlsSecret status")
}
return ctrl.Result{}, nil
}

secret, err := DvlsClient.GetSecret(dvlsSecret.Spec.EntryID)
if err != nil {
log.Error(err, "unable to fetch dvls secret", "entry-id", dvlsSecret.Spec.EntryID)
log.Error(err, "unable to fetch dvls secret", "entryId", dvlsSecret.Spec.EntryID)
meta.SetStatusCondition(&dvlsSecret.Status.Conditions, v1.Condition{Type: statusDegradedDvlsSecret, Status: v1.ConditionTrue, Reason: "Reconciling", Message: "Unable to fetch secret on DVLS instance"})
if err := r.Status().Update(ctx, dvlsSecret); err != nil {
log.Error(err, "Failed to update DvlsSecret status")
Expand Down