mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-06 07:57:07 +00:00
Code Activity

Merge pull request #71 from nirmata/bug_70

Browse source 
pass addr of value instead of adr of ptr
This commit is contained in:
shuting 2019-05-21 18:55:41 -07:00 • committed by GitHub
commit 02da55d7ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
client/client.go
View file

@ -147,7 +147,7 @@ func (c *Client) UpdateStatusResource(kind string, namespace string, obj interfa
} }
func convertToUnstructured(obj interface{}) *unstructured.Unstructured { func convertToUnstructured(obj interface{}) *unstructured.Unstructured {
unstructuredObj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(obj) unstructuredObj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&obj)
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Unable to convert : %v", err)) utilruntime.HandleError(fmt.Errorf("Unable to convert : %v", err))
return nil return nil
@ -174,7 +174,7 @@ func ConvertToRuntimeObject(obj *unstructured.Unstructured) (*runtime.Object, er
func (c *Client) GenerateSecret(generator types.Generation, namespace string) error { func (c *Client) GenerateSecret(generator types.Generation, namespace string) error {
c.logger.Printf("Preparing to create secret %s/%s", namespace, generator.Name) c.logger.Printf("Preparing to create secret %s/%s", namespace, generator.Name)
secret := &v1.Secret{} secret := v1.Secret{}
// if generator.CopyFrom != nil { // if generator.CopyFrom != nil {
c.logger.Printf("Copying data from secret %s/%s", generator.CopyFrom.Namespace, generator.CopyFrom.Name) c.logger.Printf("Copying data from secret %s/%s", generator.CopyFrom.Namespace, generator.CopyFrom.Name)
@ -206,7 +206,7 @@ func (c *Client) GenerateSecret(generator types.Generation, namespace string) er
} }
} }
go c.createSecretAfterNamespaceIsCreated(*secret, namespace) go c.createSecretAfterNamespaceIsCreated(secret, namespace)
return nil return nil
} }
@ -214,7 +214,7 @@ func (c *Client) GenerateSecret(generator types.Generation, namespace string) er
//GenerateConfigMap to generate configMap //GenerateConfigMap to generate configMap
func (c *Client) GenerateConfigMap(generator types.Generation, namespace string) error { func (c *Client) GenerateConfigMap(generator types.Generation, namespace string) error {
c.logger.Printf("Preparing to create configmap %s/%s", namespace, generator.Name) c.logger.Printf("Preparing to create configmap %s/%s", namespace, generator.Name)
configMap := &v1.ConfigMap{} configMap := v1.ConfigMap{}
// if generator.CopyFrom != nil { // if generator.CopyFrom != nil {
c.logger.Printf("Copying data from configmap %s/%s", generator.CopyFrom.Namespace, generator.CopyFrom.Name) c.logger.Printf("Copying data from configmap %s/%s", generator.CopyFrom.Namespace, generator.CopyFrom.Name)
@ -245,24 +245,24 @@ func (c *Client) GenerateConfigMap(generator types.Generation, namespace string)
configMap.Data[k] = v configMap.Data[k] = v
} }
} }
go c.createConfigMapAfterNamespaceIsCreated(*configMap, namespace) go c.createConfigMapAfterNamespaceIsCreated(configMap, namespace)
return nil return nil
} }
func convertToConfigMap(obj *unstructured.Unstructured) (*v1.ConfigMap, error) { func convertToConfigMap(obj *unstructured.Unstructured) (v1.ConfigMap, error) {
configMap := v1.ConfigMap{} configMap := v1.ConfigMap{}
if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.UnstructuredContent(), &configMap); err != nil { if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.UnstructuredContent(), &configMap); err != nil {
return nil, err return configMap, err
} }
return &configMap, nil return configMap, nil
} }
func convertToSecret(obj *unstructured.Unstructured) (*v1.Secret, error) { func convertToSecret(obj *unstructured.Unstructured) (v1.Secret, error) {
secret := v1.Secret{} secret := v1.Secret{}
if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.UnstructuredContent(), &secret); err != nil { if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.UnstructuredContent(), &secret); err != nil {
return nil, err return secret, err
} }
return &secret, nil return secret, nil
} }
func convertToCSR(obj *unstructured.Unstructured) (*certificates.CertificateSigningRequest, error) { func convertToCSR(obj *unstructured.Unstructured) (*certificates.CertificateSigningRequest, error) {