Skip to content

Commit

Permalink
change ctx parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
@cw-sakamoto
cw-sakamoto committed Dec 5, 2023
1 parent bd92e05 commit 6911b8d
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 30 deletions.
18 changes: 10 additions & 8 deletions cmd/cert-manager/cert-manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,27 +91,29 @@ func (c *CertManager) Check(ctx context.Context) error {
c.Chatwork.AddMessage(fmt.Sprintf("Error Delete Resources: %s\n", err))
}
}()
if err := c.createResources(cert, ctx); err != nil {
if err := c.createResources(ctx, cert); err != nil {
return err
}

c.Chatwork.AddMessage("cert-manager check finished\n")
return nil
}

func (c *CertManager) createResources(cert certificates, ctx context.Context) error {
func (c *CertManager) createResources(ctx context.Context, cert certificates) error {
k := k8s.NewK8s(c.Namespace, c.Clientset, c.Logger)

if err := k.CreateNamespace(&apiv1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: c.Namespace,
}}, ctx); err != nil {
if err := k.CreateNamespace(
ctx,
&apiv1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: c.Namespace,
}}); err != nil {
c.Logger().Error("Error create namespace:", err)
c.Chatwork.AddMessage(fmt.Sprint("Error create namespace:", err))
return err
}

if err := c.createCert(cert, ctx); err != nil {
if err := c.createCert(ctx, cert); err != nil {
c.Logger().Error("Error create certificate:", err)
c.Chatwork.AddMessage(fmt.Sprint("Error create certificate:", err))
return err
Expand Down Expand Up @@ -226,7 +228,7 @@ func (c *CertManager) createCertificateObject() certificates {
// createCert creates a certificate with cert-manager
// CRなので、client-goではなく、client-runtimeを使う
// ここでしか作らないリソースなので、utilのほうには入れない
func (c *CertManager) createCert(cert certificates, ctx context.Context) error {
func (c *CertManager) createCert(ctx context.Context, cert certificates) error {
c.Logger().Infoln("Create RootCA:", cert.rootCA.ObjectMeta.Name)
c.Chatwork.AddMessage(fmt.Sprintf("Create RootCA: %s\n", cert.rootCA.ObjectMeta.Name))
err := c.Client.Create(ctx, cert.rootCA)
Expand Down
12 changes: 7 additions & 5 deletions cmd/cluster-autoscaler/clusterAutoscaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,18 @@ func (c *ClusterAutoscaler) Check(ctx context.Context) error {
func (c *ClusterAutoscaler) createResources(ctx context.Context) error {
k := k8s.NewK8s(c.Namespace, c.Clientset, c.Logger)

if err := k.CreateNamespace(&apiv1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: c.Namespace,
}}, ctx); err != nil {
if err := k.CreateNamespace(
ctx,
&apiv1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: c.Namespace,
}}); err != nil {
c.Chatwork.AddMessage(fmt.Sprintf("Error Create Namespace: %s\n", err))
return err
}

c.Chatwork.AddMessage(fmt.Sprintf("Create Deployment with desire replicas %d\n", c.ReplicaCount))
if err := k.CreateDeployment(c.createDeploymentObject(), c.Timeout, ctx); err != nil {
if err := k.CreateDeployment(ctx, c.createDeploymentObject(), c.Timeout); err != nil {
c.Chatwork.AddMessage(fmt.Sprintf("Error Create Deployment: %s\n", err))
return err
}
Expand Down
14 changes: 8 additions & 6 deletions cmd/fluent/fluent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (f *Fluent) Check(ctx context.Context) error {
LabelSelector: "eks.amazonaws.com/capacityType=SPOT",
}

nodes, err := f.Clientset.CoreV1().Nodes().List(context.TODO(), nodeListOption)
nodes, err := f.Clientset.CoreV1().Nodes().List(ctx, nodeListOption)
if err != nil {
f.Logger().Errorf("Error List Nodes: %s", err)
f.Chatwork.AddMessage(fmt.Sprintf("Error List Nodes: %s\n", err))
Expand Down Expand Up @@ -122,15 +122,17 @@ func (f *Fluent) Check(ctx context.Context) error {
func (f *Fluent) createResources(ctx context.Context) error {
k := k8s.NewK8s(f.Namespace, f.Clientset, f.Logger)

if err := k.CreateNamespace(&apiv1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: f.Namespace,
}}, ctx); err != nil {
if err := k.CreateNamespace(
ctx,
&apiv1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: f.Namespace,
}}); err != nil {
f.Chatwork.AddMessage(fmt.Sprintf("Error Create Namespace: %s\n", err))
return err
}

if err := k.CreateDeployment(f.createDeploymentObject(), f.Timeout, ctx); err != nil {
if err := k.CreateDeployment(ctx, f.createDeploymentObject(), f.Timeout); err != nil {
f.Chatwork.AddMessage(fmt.Sprintf("Error Create Deployment: %s\n", err))
return err
}
Expand Down
16 changes: 9 additions & 7 deletions cmd/ingress/ingress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,22 +105,24 @@ func (i *Ingress) Check(ctx context.Context) error {
func (i *Ingress) createResources(ctx context.Context) error {
k := k8s.NewK8s(i.Namespace, i.Clientset, i.Logger)

if err := k.CreateNamespace(&apiv1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: i.Namespace,
}}, ctx); err != nil {
if err := k.CreateNamespace(
ctx,
&apiv1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: i.Namespace,
}}); err != nil {
i.Chatwork.AddMessage(fmt.Sprintf("Error Create Namespace: %s", err))
return err
}
if err := k.CreateDeployment(i.createDeploymentObject(), i.Timeout, ctx); err != nil {
if err := k.CreateDeployment(ctx, i.createDeploymentObject(), i.Timeout); err != nil {
i.Chatwork.AddMessage(fmt.Sprintf("Error Create Deployment: %s", err))
return err
}
if err := k.CreateService(i.createServiceObject(), ctx); err != nil {
if err := k.CreateService(ctx, i.createServiceObject()); err != nil {
i.Chatwork.AddMessage(fmt.Sprintf("Error Create Service: %s", err))
return err
}
if err := k.CreateIngress(i.createIngressObject(), i.Timeout, ctx); err != nil {
if err := k.CreateIngress(ctx, i.createIngressObject(), i.Timeout); err != nil {
i.Chatwork.AddMessage(fmt.Sprintf("Error Create Ingress: %s", err))
return err
}
Expand Down
8 changes: 4 additions & 4 deletions util/k8s/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func NewK8s(namespace string, clientset *kubernetes.Clientset, logger func() *lo
}

// Createは本当はApplyにしたいんだけど、ApplyがないのでCreateで代用
func (k *K8s) CreateNamespace(ns *apiv1.Namespace, ctx context.Context) error {
func (k *K8s) CreateNamespace(ctx context.Context, ns *apiv1.Namespace) error {
_, err := k.clientset.CoreV1().Namespaces().Create(ctx, ns, metav1.CreateOptions{})
k.logger().Infof("Creating Namespace: %s", ns.Name)
if err != nil && kerrors.IsAlreadyExists(err) {
Expand Down Expand Up @@ -58,7 +58,7 @@ func (k *K8s) DeleteNamespace() error {
return nil
}

func (k *K8s) CreateDeployment(deployment *appsv1.Deployment, timeout time.Duration, ctx context.Context) error {
func (k *K8s) CreateDeployment(ctx context.Context, deployment *appsv1.Deployment, timeout time.Duration) error {
deploymentsClient := k.clientset.AppsV1().Deployments(k.namespace)

// Create Deployment
Expand Down Expand Up @@ -120,7 +120,7 @@ func (k *K8s) DeleteDeployment(deploymentName string) error {
return nil
}

func (k *K8s) CreateService(service *apiv1.Service, ctx context.Context) error {
func (k *K8s) CreateService(ctx context.Context, service *apiv1.Service) error {
serviceClient := k.clientset.CoreV1().Services(k.namespace)

k.logger().Infof("Create service: %s", service.Name)
Expand Down Expand Up @@ -155,7 +155,7 @@ func (k *K8s) DeleteService(serviceName string) error {
return nil
}

func (k *K8s) CreateIngress(ingress *networkingv1.Ingress, timeout time.Duration, ctx context.Context) error {
func (k *K8s) CreateIngress(ctx context.Context, ingress *networkingv1.Ingress, timeout time.Duration) error {
ingressClient := k.clientset.NetworkingV1().Ingresses(k.namespace)

k.logger().Infof("Creating ingress: %s", ingress.Name)
Expand Down

0 comments on commit 6911b8d

Please sign in to comment.