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: remove the secret watch privilege dependency from js eb ctrler #2453

Merged
merged 4 commits into from
Feb 7, 2023
Merged

fix: remove the secret watch privilege dependency from js eb ctrler #2453

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
e57e382
fix: remove the secret watch privilege dependency from js eb ctrler
whynowy Feb 3, 2023
2ec4a8d
.
whynowy Feb 3, 2023
d41b99d
.
whynowy Feb 3, 2023
0e78fb5
.
whynowy Feb 3, 2023
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 controllers/eventbus/installer/installer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func getInstaller(eventBus *v1alpha1.EventBus, client client.Client, kubeClient
return NewNATSInstaller(client, eventBus, config, getLabels(eventBus), kubeClient, logger), nil
}
} else if js := eventBus.Spec.JetStream; js != nil {
return NewJetStreamInstaller(client, eventBus, config, getLabels(eventBus), logger), nil
return NewJetStreamInstaller(client, eventBus, config, getLabels(eventBus), kubeClient, logger), nil
}
return nil, fmt.Errorf("invalid eventbus spec")
}
Expand Down Expand Up @@ -76,7 +76,7 @@ func Uninstall(ctx context.Context, eventBus *v1alpha1.EventBus, client client.C
return fmt.Errorf("failed to check if there is any EventSource linked, %w", err)
}
if linkedEventSources > 0 {
return fmt.Errorf("Can not delete an EventBus with %v EventSources connected", linkedEventSources)
return fmt.Errorf("can not delete an EventBus with %v EventSources connected", linkedEventSources)
}

linkedSensors, err := linkedSensors(ctx, eventBus.Namespace, eventBus.Name, client)
Expand All @@ -85,7 +85,7 @@ func Uninstall(ctx context.Context, eventBus *v1alpha1.EventBus, client client.C
return fmt.Errorf("failed to check if there is any Sensor linked, %w", err)
}
if linkedSensors > 0 {
return fmt.Errorf("Can not delete an EventBus with %v Sensors connected", linkedSensors)
return fmt.Errorf("can not delete an EventBus with %v Sensors connected", linkedSensors)
}

installer, err := getInstaller(eventBus, client, kubeClient, config, logger)
Expand Down
48 changes: 32 additions & 16 deletions controllers/eventbus/installer/jetstream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ import (
apiresource "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
apitypes "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/kubernetes"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/yaml"

Expand Down Expand Up @@ -54,20 +55,22 @@ const (
)

type jetStreamInstaller struct {
client client.Client
eventBus *v1alpha1.EventBus
config *controllers.GlobalConfig
labels map[string]string
logger *zap.SugaredLogger
client client.Client
eventBus *v1alpha1.EventBus
kubeClient kubernetes.Interface
config *controllers.GlobalConfig
labels map[string]string
logger *zap.SugaredLogger
}

func NewJetStreamInstaller(client client.Client, eventBus *v1alpha1.EventBus, config *controllers.GlobalConfig, labels map[string]string, logger *zap.SugaredLogger) Installer {
func NewJetStreamInstaller(client client.Client, eventBus *v1alpha1.EventBus, config *controllers.GlobalConfig, labels map[string]string, kubeClient kubernetes.Interface, logger *zap.SugaredLogger) Installer {
return &jetStreamInstaller{
client: client,
eventBus: eventBus,
config: config,
labels: labels,
logger: logger.With("eventbus", eventBus.Name),
client: client,
kubeClient: kubeClient,
eventBus: eventBus,
config: config,
labels: labels,
logger: logger.With("eventbus", eventBus.Name),
}
}

Expand Down Expand Up @@ -488,21 +491,34 @@ func (r *jetStreamInstaller) buildStatefulSetSpec(jsVersion *controllers.JetStre
return spec
}

func (r *jetStreamInstaller) getSecret(ctx context.Context, name string) (*corev1.Secret, error) {
sl, err := r.kubeClient.CoreV1().Secrets(r.eventBus.Namespace).List(ctx, metav1.ListOptions{})
if err != nil {
return nil, err
}
for _, s := range sl.Items {
if s.Name == name && metav1.IsControlledBy(&s, r.eventBus) {
return &s, nil
}
}
return nil, apierrors.NewNotFound(schema.GroupResource{}, "")
}

func (r *jetStreamInstaller) createSecrets(ctx context.Context) error {
// first check to see if the secrets already exist
oldServerObjExisting, oldClientObjExisting := true, true

oldSObj := &corev1.Secret{}
if err := r.client.Get(ctx, apitypes.NamespacedName{Namespace: r.eventBus.Namespace, Name: generateJetStreamServerSecretName(r.eventBus)}, oldSObj); err != nil {
oldSObj, err := r.getSecret(ctx, generateJetStreamServerSecretName(r.eventBus))
if err != nil {
if apierrors.IsNotFound(err) {
oldServerObjExisting = false
} else {
return fmt.Errorf("failed to check if nats server auth secret is existing, err: %w", err)
}
}

oldCObj := &corev1.Secret{}
if err := r.client.Get(ctx, apitypes.NamespacedName{Namespace: r.eventBus.Namespace, Name: generateJetStreamClientAuthSecretName(r.eventBus)}, oldCObj); err != nil {
oldCObj, err := r.getSecret(ctx, generateJetStreamClientAuthSecretName(r.eventBus))
if err != nil {
if apierrors.IsNotFound(err) {
oldClientObjExisting = false
} else {
Expand Down
23 changes: 13 additions & 10 deletions controllers/eventbus/installer/jetstream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
apiresource "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
k8sfake "k8s.io/client-go/kubernetes/fake"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
)

Expand All @@ -40,11 +41,12 @@ func TestJetStreamBadInstallation(t *testing.T) {
badEventBus := testJetStreamEventBus.DeepCopy()
badEventBus.Spec.JetStream = nil
installer := &jetStreamInstaller{
client: fake.NewClientBuilder().Build(),
eventBus: badEventBus,
config: fakeConfig,
labels: testLabels,
logger: zaptest.NewLogger(t).Sugar(),
client: fake.NewClientBuilder().Build(),
kubeClient: k8sfake.NewSimpleClientset(),
eventBus: badEventBus,
config: fakeConfig,
labels: testLabels,
logger: zaptest.NewLogger(t).Sugar(),
}
_, err := installer.Install(context.TODO())
assert.Error(t, err)
Expand All @@ -70,11 +72,12 @@ func TestJetStreamCreateObjects(t *testing.T) {
cl := fake.NewClientBuilder().Build()
ctx := context.TODO()
i := &jetStreamInstaller{
client: cl,
eventBus: testJetStreamEventBus,
config: fakeConfig,
labels: testLabels,
logger: zaptest.NewLogger(t).Sugar(),
client: cl,
kubeClient: k8sfake.NewSimpleClientset(),
eventBus: testJetStreamEventBus,
config: fakeConfig,
labels: testLabels,
logger: zaptest.NewLogger(t).Sugar(),
}

t.Run("test create sts", func(t *testing.T) {
Expand Down
7 changes: 6 additions & 1 deletion manifests/base/controller-manager/controller-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ data:
duplicates: 300s
versions:
- version: latest
natsImage: nats:2.9.1
natsImage: nats:2.9.12
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
startCommand: /nats-server
Expand Down Expand Up @@ -57,3 +57,8 @@ data:
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
startCommand: /nats-server
- version: 2.9.12
natsImage: nats:2.9.12
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
startCommand: /nats-server
7 changes: 6 additions & 1 deletion manifests/install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ data:
duplicates: 300s
versions:
- version: latest
natsImage: nats:2.9.1
natsImage: nats:2.9.12
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
startCommand: /nats-server
Expand Down Expand Up @@ -361,6 +361,11 @@ data:
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
startCommand: /nats-server
- version: 2.9.12
natsImage: nats:2.9.12
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
startCommand: /nats-server
kind: ConfigMap
metadata:
name: argo-events-controller-config
Expand Down
7 changes: 6 additions & 1 deletion manifests/namespace-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ data:
duplicates: 300s
versions:
- version: latest
natsImage: nats:2.9.1
natsImage: nats:2.9.12
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
startCommand: /nats-server
Expand Down Expand Up @@ -281,6 +281,11 @@ data:
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
startCommand: /nats-server
- version: 2.9.12
natsImage: nats:2.9.12
metricsExporterImage: natsio/prometheus-nats-exporter:0.9.1
configReloaderImage: natsio/nats-server-config-reloader:0.7.0
startCommand: /nats-server
kind: ConfigMap
metadata:
name: argo-events-controller-config
Expand Down