Skip to content

Commit

Permalink
Revert to individual secret get
Browse files Browse the repository at this point in the history
  • Loading branch information
liggitt committed Jul 18, 2020
1 parent 0a4d7d3 commit 43b78dc
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
21 changes: 14 additions & 7 deletions pkg/translator/translator.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,20 @@ type Env struct {
// NewEnv returns an Env for the given Ingress.
func NewEnv(ing *v1beta1.Ingress, client kubernetes.Interface, vip, net, subnet string) (*Env, error) {
ret := &Env{Ing: ing, SecretsMap: make(map[string]*api_v1.Secret), VIP: vip, Network: net, Subnetwork: subnet}
secrets, err := client.CoreV1().Secrets(ing.Namespace).List(context.TODO(), meta_v1.ListOptions{})
if err != nil {
return nil, err
}
for _, s := range secrets.Items {
s := s
ret.SecretsMap[s.Name] = &s
for _, tlsSpec := range ing.Spec.TLS {
if len(tlsSpec.SecretName) == 0 {
// doesn't use a secret
continue
}
if _, ok := ret.SecretsMap[tlsSpec.SecretName]; ok {
// already fetched
continue
}
secret, err := client.CoreV1().Secrets(ing.Namespace).Get(context.TODO(), tlsSpec.SecretName, meta_v1.GetOptions{})
if err != nil {
return nil, err
}
ret.SecretsMap[tlsSpec.SecretName] = secret
}
return ret, nil
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/translator/translator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,10 @@ func TestSecrets(t *testing.T) {

env, err := NewEnv(tc.ing, kubeClient, "", "", "")
if err != nil {
if tc.wantErr {
// we look up secrets in NewEnv, so an error here is ok
return
}
t.Fatalf("NewEnv(): %v", err)
}

Expand Down

0 comments on commit 43b78dc

Please sign in to comment.