Skip to content

Commit

Permalink
Fix a golangci-lint issue: unparam namespace
Browse files Browse the repository at this point in the history 
Signed-off-by: Bharath Nallapeta <[email protected]>
  • Loading branch information
@bnallapeta
bnallapeta committed Dec 27, 2024
1 parent 4cacfe0 commit 1556c2a
Show file tree
Hide file tree
Showing 9 changed files with 232 additions and 57 deletions.
2 changes: 2 additions & 0 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
_ "k8s.io/client-go/plugin/pkg/client/auth"
capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
capo "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
capv "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/healthz"
Expand Down Expand Up @@ -57,6 +58,7 @@ func init() {
utilruntime.Must(sveltosv1beta1.AddToScheme(scheme))
utilruntime.Must(capz.AddToScheme(scheme))
utilruntime.Must(capv.AddToScheme(scheme))
utilruntime.Must(capo.AddToScheme(scheme))
// +kubebuilder:scaffold:scheme
}

Expand Down
8 changes: 3 additions & 5 deletions config/dev/openstack-credentials.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ stringData:
openstack:
auth:
auth_url: ${OS_AUTH_URL}
username: ${OS_USERNAME}
password: ${OS_PASSWORD}
project_id: ${OS_PROJECT_ID}
project_name: ${OS_PROJECT_NAME}
user_domain_name: ${OS_USER_DOMAIN_NAME}
application_credential_id: ${OS_APPLICATION_CREDENTIAL_ID}
application_credential_secret: ${OS_APPLICATION_CREDENTIAL_SECRET}
region_name: ${OS_REGION_NAME}
interface: ${OS_INTERFACE}
identity_api_version: ${OS_IDENTITY_API_VERSION}
auth_type: ${OS_AUTH_TYPE}
---
apiVersion: hmc.mirantis.com/v1alpha1
kind: Credential
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ require (
sigs.k8s.io/cluster-api v1.9.3
sigs.k8s.io/cluster-api-operator v0.14.0
sigs.k8s.io/cluster-api-provider-azure v1.17.2
sigs.k8s.io/cluster-api-provider-openstack v0.11.3
sigs.k8s.io/cluster-api-provider-vsphere v1.12.0
sigs.k8s.io/controller-runtime v0.19.3
sigs.k8s.io/yaml v1.4.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,8 @@ sigs.k8s.io/cluster-api-operator v0.14.0 h1:0QgO6+XGrNNJnNHKBwvQD5v6w+EaH3Z0RL1n
sigs.k8s.io/cluster-api-operator v0.14.0/go.mod h1:euShpVN6HyxXas28HkrYxhCPVDW1UV6ljbRBAeCxp8Y=
sigs.k8s.io/cluster-api-provider-azure v1.17.2 h1:uS9ggE/bryI0hiOWHBa56nYHkWmsPZW3bzYeAddL4vM=
sigs.k8s.io/cluster-api-provider-azure v1.17.2/go.mod h1:ohdf0TYutOn5vKsXpNVeZUVfUSNIwNhfF6wDjbiqPI0=
sigs.k8s.io/cluster-api-provider-openstack v0.11.3 h1:ZJ3G+m11bgaD227EuFjuFsFC95MRzJm9JbDIte0xwII=
sigs.k8s.io/cluster-api-provider-openstack v0.11.3/go.mod h1:0rH6yksLcuwWK/SoSoCOJi4A0kOSL3qrA+qvDVZ9NjU=
sigs.k8s.io/cluster-api-provider-vsphere v1.12.0 h1:9ze+1JSdLAGiLklsnORvj/vs2XpR9jyVmkT0Dwo1nuc=
sigs.k8s.io/cluster-api-provider-vsphere v1.12.0/go.mod h1:2y9fsZQ3qjT1kL6IXiOUVcyV0n8DLBQGvyPnId9xRzk=
sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw=
Expand Down
24 changes: 13 additions & 11 deletions internal/controller/clusterdeployment_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,9 @@ func (r *ClusterDeploymentReconciler) updateCluster(ctx context.Context, mc *hmc
},
ChartRef: clusterTpl.Status.ChartRef,
}
if clusterTpl.Spec.Helm.ChartSpec != nil {
hrReconcileOpts.ReconcileInterval = &clusterTpl.Spec.Helm.ChartSpec.Interval.Duration
reconcileInterval := clusterTpl.Spec.Helm.ChartSpec.Interval.Duration
if reconcileInterval != 0 {
hrReconcileOpts.ReconcileInterval = &reconcileInterval
}

hr, _, err := helm.ReconcileHelmRelease(ctx, r.Client, mc.Name, mc.Namespace, hrReconcileOpts)
Expand Down Expand Up @@ -354,11 +355,9 @@ func (r *ClusterDeploymentReconciler) updateCluster(ctx context.Context, mc *hmc
return ctrl.Result{RequeueAfter: DefaultRequeueInterval}, nil
}

if mc.Spec.PropagateCredentials {
if err := r.reconcileCredentialPropagation(ctx, mc); err != nil {
l.Error(err, "failed to reconcile credentials propagation")
return ctrl.Result{}, err
}
if err := r.reconcileCredentialPropagation(ctx, mc, cred); err != nil {
l.Error(err, "failed to reconcile credentials propagation")
return ctrl.Result{}, err
}

return ctrl.Result{}, nil
Expand Down Expand Up @@ -497,9 +496,11 @@ func validateReleaseWithValues(ctx context.Context, actionConfig *action.Configu
if err != nil {
return err
}

_, err = install.RunWithContext(ctx, hcChart, vals)
return err
if err != nil {
return err
}
return nil
}

// updateStatus updates the status for the ClusterDeployment object.
Expand Down Expand Up @@ -696,7 +697,7 @@ func (r *ClusterDeploymentReconciler) objectsAvailable(ctx context.Context, name
return len(itemsList.Items) != 0, nil
}

func (r *ClusterDeploymentReconciler) reconcileCredentialPropagation(ctx context.Context, clusterDeployment *hmc.ClusterDeployment) error {
func (r *ClusterDeploymentReconciler) reconcileCredentialPropagation(ctx context.Context, clusterDeployment *hmc.ClusterDeployment, credential *hmc.Credential) error {
l := ctrl.LoggerFrom(ctx)
l.Info("Reconciling CCM credentials propagation")

Expand All @@ -715,8 +716,9 @@ func (r *ClusterDeploymentReconciler) reconcileCredentialPropagation(ctx context

propnCfg := &credspropagation.PropagationCfg{
Client: r.Client,
ClusterDeployment: clusterDeployment,
IdentityRef: credential.Spec.IdentityRef,
KubeconfSecret: kubeconfSecret,
ClusterDeployment: clusterDeployment,
SystemNamespace: r.SystemNamespace,
}

Expand Down
3 changes: 1 addition & 2 deletions internal/credspropagation/azure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"fmt"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down Expand Up @@ -94,7 +93,7 @@ func generateAzureCCMSecret(azureCluster *capz.AzureCluster, azureClIdty *capz.A
"cloud-config": azureJSON,
}

return makeSecret("azure-cloud-provider", metav1.NamespaceSystem, secretData), nil
return makeSecret("azure-cloud-provider", secretData), nil
}

func getAzureSubnetData(azureCluster *capz.AzureCluster) (subnetName, secGroup, routeTable string) {
Expand Down
17 changes: 11 additions & 6 deletions internal/credspropagation/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ import (

type PropagationCfg struct {
Client client.Client
ClusterDeployment *hmc.ClusterDeployment
KubeconfSecret *corev1.Secret
IdentityRef *corev1.ObjectReference
ClusterDeployment *hmc.ClusterDeployment
SystemNamespace string
}

Expand All @@ -53,23 +54,23 @@ func applyCCMConfigs(ctx context.Context, kubeconfSecret *corev1.Secret, objects
return nil
}

func makeSecret(name, namespace string, data map[string][]byte) *corev1.Secret {
func makeSecret(name string, data map[string][]byte) *corev1.Secret {
s := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
Namespace: metav1.NamespaceSystem,
},
Data: data,
}
s.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Secret"))
return s
}

func makeConfigMap(name, namespace string, data map[string]string) *corev1.ConfigMap {
func makeConfigMap(name string, data map[string]string) *corev1.ConfigMap {
c := &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
Namespace: metav1.NamespaceSystem,
},
Data: data,
}
Expand All @@ -86,7 +87,11 @@ func makeClientFromSecret(kubeconfSecret *corev1.Secret) (client.Client, error)
if err != nil {
return nil, err
}
return client.New(restConfig, client.Options{
cl, err := client.New(restConfig, client.Options{
Scheme: scheme,
})
if err != nil {
return nil, err
}
return cl, nil
}
Loading

0 comments on commit 1556c2a

Please sign in to comment.