diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 73593dd..453942b 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -67,6 +67,7 @@ jobs: - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v3 + if: always() with: sarif_file: 'trivy-results.sarif' #env: diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml index 51c8080..32d91b9 100644 --- a/.github/workflows/scan.yaml +++ b/.github/workflows/scan.yaml @@ -27,6 +27,7 @@ jobs: # we let the report trigger content trigger a failure using the GitHub Security features. args: '-fmt sarif -out results.sarif ./...' - name: Upload SARIF file + if: always() uses: github/codeql-action/upload-sarif@v3 with: # Path to SARIF file relative to the root of the repository diff --git a/internal/controller/valkey_controller.go b/internal/controller/valkey_controller.go index 56534d5..877175f 100644 --- a/internal/controller/valkey_controller.go +++ b/internal/controller/valkey_controller.go @@ -19,12 +19,15 @@ package controller import ( "context" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" hyperv1 "hyperspike.io/valkey-operator/api/v1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // ValkeyReconciler reconciles a Valkey object @@ -74,6 +77,28 @@ func (r *ValkeyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr } func (r *ValkeyReconciler) upsertConfigMap(ctx context.Context, valkey *hyperv1.Valkey) error { + logger := log.FromContext(ctx) + + logger.Info("upserting configmap", "valkey", valkey.Name, "namespace", valkey.Namespace) + + cm := &corev1.ConfigMap{ + ObjectMeta: metav1.ObjectMeta{ + Name: valkey.Name, + Namespace: valkey.Namespace, + }, + Data: map[string]string{ + "": "", + }, + } + if err := r.Create(ctx, cm); err != nil { + if errors.IsAlreadyExists(err) { + if err := r.Update(ctx, cm); err != nil { + return err + } + } else { + return err + } + } return nil }