aherman
/
terraform
mirror of https://github.com/hashicorp/terraform
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

k8s-backend - Initial context support for library update

Browse Source 
Signed-off-by: Jared Ledvina <jared.ledvina@datadoghq.com>
pull/29953/head
Jared Ledvina 5 years ago committed by James Bardin
parent ac52f5135a
commit 61a5808680
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
internal/backend/remote-state/kubernetes/backend_state.go
Unescape View File

@ -1,6 +1,7 @@
package kubernetes
import (
"context"
"errors"
"fmt"
"sort"
@ -21,6 +22,7 @@ func (b *Backend) Workspaces() ([]string, error) {
}
secrets, err := secretClient.List(
context.Background(),
metav1.ListOptions{
LabelSelector: tfstateKey + "=true",
},

12
internal/backend/remote-state/kubernetes/backend_test.go
Unescape View File

@ -1,6 +1,7 @@
package kubernetes
import (
"context"
"fmt"
"math/rand"
"os"
@ -124,6 +125,7 @@ func TestBackendLocksSoak(t *testing.T) {
}
func cleanupK8sResources(t *testing.T) {
ctx := context.Background()
// Get a backend to use the k8s client
b1 := backend.TestBackendConfig(t, New(), backend.TestWrapConfig(map[string]interface{}{
"secret_suffix": secretSuffix,
@ -138,13 +140,13 @@ func cleanupK8sResources(t *testing.T) {
// Delete secrets
opts := metav1.ListOptions{LabelSelector: tfstateKey + "=true"}
secrets, err := sClient.List(opts)
secrets, err := sClient.List(ctx, opts)
if err != nil {
t.Fatal(err)
}
delProp := metav1.DeletePropagationBackground
delOps := &metav1.DeleteOptions{PropagationPolicy: &delProp}
delOps := metav1.DeleteOptions{PropagationPolicy: &delProp}
var errs []error
for _, secret := range secrets.Items {
@ -155,7 +157,7 @@ func cleanupK8sResources(t *testing.T) {
}
if key == secretSuffix {
err = sClient.Delete(secret.GetName(), delOps)
err = sClient.Delete(ctx, secret.GetName(), delOps)
if err != nil {
errs = append(errs, err)
}
@ -168,7 +170,7 @@ func cleanupK8sResources(t *testing.T) {
}
// Delete leases
leases, err := leaseClient.List(opts)
leases, err := leaseClient.List(ctx, opts)
if err != nil {
t.Fatal(err)
}
@ -181,7 +183,7 @@ func cleanupK8sResources(t *testing.T) {
}
if key == secretSuffix {
err = leaseClient.Delete(lease.GetName(), delOps)
err = leaseClient.Delete(ctx, lease.GetName(), delOps)
if err != nil {
errs = append(errs, err)
}

27
internal/backend/remote-state/kubernetes/client.go
Unescape View File

@ -3,6 +3,7 @@ package kubernetes
import (
"bytes"
"compress/gzip"
"context"
"crypto/md5"
"encoding/base64"
"encoding/json"
@ -46,7 +47,7 @@ func (c *RemoteClient) Get() (payload *remote.Payload, err error) {
if err != nil {
return nil, err
}
secret, err := c.kubernetesSecretClient.Get(secretName, metav1.GetOptions{})
secret, err := c.kubernetesSecretClient.Get(context.Background(), secretName, metav1.GetOptions{})
if err != nil {
if k8serrors.IsNotFound(err) {
return nil, nil
@ -78,6 +79,7 @@ func (c *RemoteClient) Get() (payload *remote.Payload, err error) {
}
func (c *RemoteClient) Put(data []byte) error {
ctx := context.Background()
secretName, err := c.createSecretName()
if err != nil {
return err
@ -105,14 +107,14 @@ func (c *RemoteClient) Put(data []byte) error {
},
}
secret, err = c.kubernetesSecretClient.Create(secret, metav1.CreateOptions{})
secret, err = c.kubernetesSecretClient.Create(ctx, secret, metav1.CreateOptions{})
if err != nil {
return err
}
}
setState(secret, payload)
_, err = c.kubernetesSecretClient.Update(secret, metav1.UpdateOptions{})
_, err = c.kubernetesSecretClient.Update(ctx, secret, metav1.UpdateOptions{})
return err
}
@ -145,6 +147,7 @@ func (c *RemoteClient) Delete() error {
}
func (c *RemoteClient) Lock(info *statemgr.LockInfo) (string, error) {
ctx := context.Background()
leaseName, err := c.createLeaseName()
if err != nil {
return "", err
@ -170,7 +173,7 @@ func (c *RemoteClient) Lock(info *statemgr.LockInfo) (string, error) {
},
}
_, err = c.kubernetesLeaseClient.Create(lease)
_, err = c.kubernetesLeaseClient.Create(ctx, lease, metav1.CreateOptions{})
if err != nil {
return "", err
} else {
@ -197,7 +200,7 @@ func (c *RemoteClient) Lock(info *statemgr.LockInfo) (string, error) {
lease.Spec.HolderIdentity = pointer.StringPtr(info.ID)
setLockInfo(lease, info.Marshal())
_, err = c.kubernetesLeaseClient.Update(lease)
_, err = c.kubernetesLeaseClient.Update(ctx, lease, metav1.UpdateOptions{})
if err != nil {
return "", err
}
@ -234,7 +237,7 @@ func (c *RemoteClient) Unlock(id string) error {
lease.Spec.HolderIdentity = nil
removeLockInfo(lease)
_, err = c.kubernetesLeaseClient.Update(lease)
_, err = c.kubernetesLeaseClient.Update(context.Background(), lease, metav1.UpdateOptions{})
if err != nil {
lockErr.Err = err
return lockErr
@ -276,11 +279,11 @@ func (c *RemoteClient) getLabels() map[string]string {
}
func (c *RemoteClient) getSecret(name string) (*unstructured.Unstructured, error) {
return c.kubernetesSecretClient.Get(name, metav1.GetOptions{})
return c.kubernetesSecretClient.Get(context.Background(), name, metav1.GetOptions{})
}
func (c *RemoteClient) getLease(name string) (*coordinationv1.Lease, error) {
return c.kubernetesLeaseClient.Get(name, metav1.GetOptions{})
return c.kubernetesLeaseClient.Get(context.Background(), name, metav1.GetOptions{})
}
func (c *RemoteClient) deleteSecret(name string) error {
@ -296,8 +299,8 @@ func (c *RemoteClient) deleteSecret(name string) error {
}
delProp := metav1.DeletePropagationBackground
delOps := &metav1.DeleteOptions{PropagationPolicy: &delProp}
return c.kubernetesSecretClient.Delete(name, delOps)
delOps := metav1.DeleteOptions{PropagationPolicy: &delProp}
return c.kubernetesSecretClient.Delete(context.Background(), name, delOps)
}
func (c *RemoteClient) deleteLease(name string) error {
@ -313,8 +316,8 @@ func (c *RemoteClient) deleteLease(name string) error {
}
delProp := metav1.DeletePropagationBackground
delOps := &metav1.DeleteOptions{PropagationPolicy: &delProp}
return c.kubernetesLeaseClient.Delete(name, delOps)
delOps := metav1.DeleteOptions{PropagationPolicy: &delProp}
return c.kubernetesLeaseClient.Delete(context.Background(), name, delOps)
}
func (c *RemoteClient) createSecretName() (string, error) {

Write Preview
Loading…
Cancel
Save