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.

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

feat: Add creation of ConfigMap for Stage #79

Merged
merged 1 commit into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 0 deletions controllers/stage/chain/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func CreateChain(ctx context.Context, c client.Client, stage *cdPipeApi.Stage) (
AddApplicationSetGenerators{
applicationSetManager: argocd.NewArgoApplicationSetManager(c),
},
NewPutConfigMap(c),
)

return ch, nil
Expand Down
69 changes: 69 additions & 0 deletions controllers/stage/chain/put_configmap.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package chain

import (
"context"
"fmt"

corev1 "k8s.io/api/core/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

cdPipeApi "github.com/epam/edp-cd-pipeline-operator/v2/api/v1"
)

type PutConfigMap struct {
k8sClient client.Client
}

func NewPutConfigMap(k8sClient client.Client) *PutConfigMap {
return &PutConfigMap{k8sClient: k8sClient}
}

func (h *PutConfigMap) ServeRequest(ctx context.Context, stage *cdPipeApi.Stage) error {
log := ctrl.LoggerFrom(ctx)

log.Info("Start putting ConfigMap", "configMapName", stage.Name)

cm := &corev1.ConfigMap{}

err := h.k8sClient.Get(
ctx,
types.NamespacedName{
Namespace: stage.Namespace,
Name: stage.Name,
},
cm,
)
if err != nil && !k8sErrors.IsNotFound(err) {
return fmt.Errorf("failed to get ConfigMap: %w", err)
}

if err == nil {
log.Info("ConfigMap already exists")

return nil
}

cm = &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: stage.Name,
Namespace: stage.Namespace,
},
}

if err = controllerutil.SetControllerReference(stage, cm, h.k8sClient.Scheme()); err != nil {
return fmt.Errorf("failed to set controller reference: %w", err)
}

if err = h.k8sClient.Create(ctx, cm); err != nil {
return fmt.Errorf("failed to create ConfigMap: %w", err)
}

log.Info("ConfigMap has been created")

return nil
}
91 changes: 91 additions & 0 deletions controllers/stage/chain/put_configmap_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
package chain

import (
"context"
"testing"

"github.com/go-logr/logr"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

cdPipeApi "github.com/epam/edp-cd-pipeline-operator/v2/api/v1"
)

func TestPutConfigMap_ServeRequest(t *testing.T) {
t.Parallel()

scheme := runtime.NewScheme()
require.NoError(t, corev1.AddToScheme(scheme))
require.NoError(t, cdPipeApi.AddToScheme(scheme))

tests := []struct {
name string
stage *cdPipeApi.Stage
client func(t *testing.T) client.Client
wantErr require.ErrorAssertionFunc
want func(t *testing.T, stage *cdPipeApi.Stage, cl client.Client)
}{
{
name: "create configmap successfully",
stage: &cdPipeApi.Stage{
ObjectMeta: metav1.ObjectMeta{
Name: "pipe-dev",
Namespace: "default",
},
},
client: func(t *testing.T) client.Client {
return fake.NewClientBuilder().WithScheme(scheme).Build()
},
wantErr: require.NoError,
want: func(t *testing.T, stage *cdPipeApi.Stage, cl client.Client) {
cm := &corev1.ConfigMap{}
require.NoError(t, cl.Get(
context.Background(),
client.ObjectKey{Namespace: stage.Namespace, Name: stage.Name},
cm,
))
},
},
{
name: "configmap already exists",
stage: &cdPipeApi.Stage{
ObjectMeta: metav1.ObjectMeta{
Name: "pipe-dev",
Namespace: "default",
},
},
client: func(t *testing.T) client.Client {
return fake.NewClientBuilder().
WithScheme(scheme).
WithObjects(
&corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: "pipe-dev",
Namespace: "default",
},
},
).
Build()
},
wantErr: require.NoError,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
cl := tt.client(t)
h := NewPutConfigMap(cl)

tt.wantErr(t, h.ServeRequest(ctrl.LoggerInto(context.Background(), logr.Discard()), tt.stage))

if tt.want != nil {
tt.want(t, tt.stage, cl)
}
})
}
}
12 changes: 12 additions & 0 deletions tests/e2e/capsule-feature/03-assert-cdpipeline-and-stages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -302,3 +302,15 @@ spec:
targetRevision: >-
{{ if eq .versionType "edp" }}build/{{ .imageTag }}{{ else }}{{
.imageTag }}{{ end }}

---
apiVersion: v1
kind: ConfigMap
metadata:
name: mypipeline-dev

---
apiVersion: v1
kind: ConfigMap
metadata:
name: mypipeline-qa
Loading