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.

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

fix for Flux plugin requires an additional config getter #3560 #3582

Merged
merged 4 commits into from
Oct 13, 2021
Merged

fix for Flux plugin requires an additional config getter #3560 #3582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d43e7d
step 1
gfichtenholt Oct 11, 2021
a13184e
Merge branch 'master' into further-fluxv2-plugin-features-13
gfichtenholt Oct 11, 2021
8f73b70
step 2
gfichtenholt Oct 12, 2021
2205f24
fix unit tests
gfichtenholt Oct 12, 2021
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: 3 additions & 3 deletions chart/kubeapps/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ dependencies:
version: 1.10.0
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.12.2
version: 10.12.3
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 15.4.1
digest: sha256:624869c765621f51da8446d0c472aa997710be01033badac8feea3dbb130e23e
generated: "2021-10-07T08:55:54.569891292Z"
digest: sha256:9efa553aecdfbf8e3199446831ac2492d718ec6cf07380f924ae9fead8243c38
generated: "2021-10-10T22:58:07.960326-07:00"
22 changes: 10 additions & 12 deletions cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ type cacheValueDeleter func(string, map[string]interface{}) (bool, error)
// TODO (gfichtenholt) rename this to just Config when caching is separated out into core server
// and/or caching-rleated code is moved into a separate package?
type cacheConfig struct {
gvr schema.GroupVersionResource
gvr schema.GroupVersionResource
// this clientGetter is for running out-of-request interactions with the Kubernetes API server,
// such as watching for resource changes
clientGetter clientGetter
// 'onAdd' and 'onModify' hooks are called when a new or modified object comes about and
// allows the plug-in to return information about WHETHER OR NOT and WHAT is to be stored
Expand Down Expand Up @@ -114,22 +116,18 @@ func newCacheWithRedisClient(config cacheConfig, redisCli *redis.Client, waitGro

if redisCli == nil {
return nil, status.Errorf(codes.FailedPrecondition, "server not configured with redis Client")
}

if config.clientGetter == nil {
return nil, status.Errorf(codes.FailedPrecondition, "server not configured with configGetter")
}

if config.onAdd == nil || config.onModify == nil || config.onDelete == nil || config.onGet == nil {
} else if config.clientGetter == nil {
return nil, status.Errorf(codes.FailedPrecondition, "server not configured with clientGetter")
} else if config.onAdd == nil || config.onModify == nil || config.onDelete == nil || config.onGet == nil {
return nil, status.Errorf(codes.FailedPrecondition, "server not configured with expected cache hooks")
}

// sanity check that the redis client is connected
pong, err := redisCli.Ping(redisCli.Context()).Result()
if err != nil {
if pong, err := redisCli.Ping(redisCli.Context()).Result(); err != nil {
return nil, err
} else {
log.Infof("[PING] -> [%s]", pong)
}
log.Infof("[PING] -> [%s]", pong)

c := NamespacedResourceWatcherCache{
config: config,
Expand All @@ -138,7 +136,7 @@ func newCacheWithRedisClient(config cacheConfig, redisCli *redis.Client, waitGro
}

// sanity check that the specified GVR is a valid registered CRD
if err = c.isGvrValid(); err != nil {
if err := c.isGvrValid(); err != nil {
return nil, err
}

Expand Down
13 changes: 4 additions & 9 deletions cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/integration_utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
Expand Down Expand Up @@ -185,14 +184,10 @@ func kubeDeleteHelmRepository(t *testing.T, name, namespace string) error {
return nil
}

func kubeForceDeleteHelmRelease(t *testing.T, name, namespace string) error {
t.Logf("+kubeForceDeleteHelmRelease(%s,%s)", name, namespace)
func kubeDeleteHelmRelease(t *testing.T, name, namespace string) error {
t.Logf("+kubeDeleteHelmRelease(%s,%s)", name, namespace)
if ifc, err := kubeGetHelmReleaseResourceInterface(namespace); err != nil {
return err
// remove finalizer on HelmRelease cuz sometimes it gets stuck indefinitely
} else if _, err = ifc.Patch(context.TODO(), name, types.JSONPatchType,
[]byte("[ { \"op\": \"remove\", \"path\": \"/metadata/finalizers\" } ]"), metav1.PatchOptions{}); err != nil {
return err
} else if err = ifc.Delete(context.TODO(), name, metav1.DeleteOptions{}); err != nil {
return err
}
Expand Down Expand Up @@ -228,7 +223,7 @@ func kubeGetPodNames(t *testing.T, namespace string) (names []string, err error)
// will create a service account with cluster-admin privs and return the associated
// Bearer token (base64-encoded)
func kubeCreateAdminServiceAccount(t *testing.T, name, namespace string) (string, error) {
t.Logf("+kubeCreateServiceAccount(%s,%s)", name, namespace)
t.Logf("+kubeCreateAdminServiceAccount(%s,%s)", name, namespace)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

phew I got scared for a second before I realised this code is part of the integration test utilities :P

typedClient, err := kubeGetTypedClient()
if err != nil {
return "", err
Expand Down Expand Up @@ -256,7 +251,7 @@ func kubeCreateAdminServiceAccount(t *testing.T, name, namespace string) (string
secretName = svcAccount.Secrets[0].Name
break
}
t.Logf("Waiting 1s for service account [%s] secret...", name)
t.Logf("Waiting 1s for service account [%s] secret to be set up... [%d/%d]", name, i+1, 10)
time.Sleep(1 * time.Second)
}
if secretName == "" {
Expand Down
24 changes: 21 additions & 3 deletions cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,13 @@ func (s *Server) installedPkgSummaryFromRelease(unstructuredRelease map[string]i
func (s *Server) installedPackageDetail(ctx context.Context, name types.NamespacedName) (*corev1.InstalledPackageDetail, error) {
unstructuredRelease, err := s.getReleaseInCluster(ctx, name)
if err != nil {
return nil, status.Errorf(codes.NotFound, "Unable to find Helm release %q due to: %v", name, err)
if errors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "%q", err)
} else if errors.IsForbidden(err) || errors.IsUnauthorized(err) {
return nil, status.Errorf(codes.Unauthenticated, "unable to get release due to %v", err)
} else {
return nil, status.Errorf(codes.Internal, "%q", err)
}
}

log.V(4).Infof("installedPackageDetail:\n[%s]", prettyPrintMap(unstructuredRelease.Object))
Expand Down Expand Up @@ -367,7 +373,11 @@ func (s *Server) newRelease(ctx context.Context, packageRef *corev1.AvailablePac
}
newRelease, err := resourceIfc.Create(ctx, fluxHelmRelease, metav1.CreateOptions{})
if err != nil {
return nil, err
if errors.IsForbidden(err) || errors.IsUnauthorized(err) {
return nil, status.Errorf(codes.Unauthenticated, "Unable to create release due to %v", err)
} else {
return nil, err
}
}

name, err := namespacedName(newRelease.Object)
Expand All @@ -391,6 +401,8 @@ func (s *Server) updateRelease(ctx context.Context, packageRef *corev1.Installed
if err != nil {
if errors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "%q", err)
} else if errors.IsForbidden(err) || errors.IsUnauthorized(err) {
return nil, status.Errorf(codes.Unauthenticated, "Unable to ase due to %v", err)
} else {
return nil, status.Errorf(codes.Internal, "%q", err)
}
Expand Down Expand Up @@ -452,7 +464,11 @@ func (s *Server) updateRelease(ctx context.Context, packageRef *corev1.Installed
// replace the object in k8s with a new desired state
unstructuredRel, err = ifc.Update(ctx, unstructuredRel, metav1.UpdateOptions{})
if err != nil {
return nil, err
if errors.IsForbidden(err) || errors.IsUnauthorized(err) {
return nil, status.Errorf(codes.Unauthenticated, "Unable to update release due to %v", err)
} else {
return nil, err
}
}

log.V(4).Infof("Updated release: %s", prettyPrintMap(unstructuredRel.Object))
Expand All @@ -475,6 +491,8 @@ func (s *Server) deleteRelease(ctx context.Context, packageRef *corev1.Installed
if err = ifc.Delete(ctx, packageRef.Identifier, metav1.DeleteOptions{}); err != nil {
if errors.IsNotFound(err) {
return status.Errorf(codes.NotFound, "%q", err)
} else if errors.IsForbidden(err) || errors.IsUnauthorized(err) {
return status.Errorf(codes.Unauthenticated, "Unable to delete release due to %v", err)
} else {
return status.Errorf(codes.Internal, "%q", err)
}
Expand Down
Loading