Skip to content

Commit

Permalink
Fix reconciler issue while creating knative service
Browse files Browse the repository at this point in the history
  • Loading branch information
@savitaashture @tekton-robot
savitaashture authored and tekton-robot committed Mar 15, 2021
1 parent f90ab96 commit f269eda
Show file tree
Hide file tree
Showing 5 changed files with 228 additions and 516 deletions.
2 changes: 1 addition & 1 deletion examples/custom-resource/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Creates an EventListener that listens for GitHub webhook events.
-H 'X-Hub-Signature: sha1=ba0cdc263b3492a74b601d240c27efe81c4720cb' \
-H 'Content-Type: application/json' \
-d '{"action": "opened", "pull_request":{"head":{"sha": "28911bbb5a3e2ea034daf1f6be0a822d50e31e73"}},"repository":{"clone_url": "https://github.com/tektoncd/triggers.git"}}' \
http://localhost:8080
http://<el_address>
```

The response status code is `201 Created`
Expand Down
214 changes: 0 additions & 214 deletions pkg/dynamic/custom_reconcile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,226 +18,12 @@ package dynamic

import (
"encoding/json"
"reflect"

logger "github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"knative.dev/pkg/apis/duck/v1beta1"
)

func ReconcileCustomObject(existing, desired *unstructured.Unstructured) (updated bool) {
originalMetaLabel, change := getNestedFieldCopyData(existing, desired, "metadata", "labels")
if !change {
updated = true
if err := unstructured.SetNestedField(existing.Object, originalMetaLabel, "metadata", "labels"); err != nil {
logger.Error("failed to set metadata labels to existing object: ", err)
updated = false
}
}

originalMetaOwner, change := getNestedFieldCopyData(existing, desired, "metadata", "ownerReferences")
if !change {
updated = true
if err := unstructured.SetNestedField(existing.Object, originalMetaOwner, "metadata", "ownerReferences"); err != nil {
logger.Error("failed to set metadata ownerReferences to existing object: ", err)
updated = false
}
}

existingMetaAnno, _, _ := unstructured.NestedFieldCopy(existing.Object, "metadata", "annotations")
originalMetaAnno, _, _ := unstructured.NestedFieldCopy(desired.Object, "metadata", "annotations")
originalAnno, _ := originalMetaAnno.(map[string]string)
existingAnno, _ := existingMetaAnno.(map[string]string)
if !reflect.DeepEqual(existingMetaAnno, MergeMaps(existingAnno, originalAnno)) {
updated = true
if err := unstructured.SetNestedField(existing.Object, originalMetaAnno, "metadata", "annotations"); err != nil {
logger.Error("failed to set metadata annotations to existing object: ", err)
updated = false
}
}

originalSpecMetaName, change := getNestedFieldCopyData(existing, desired, "spec", "template", "metadata", "name")
if !change {
updated = true
if err := unstructured.SetNestedField(existing.Object, originalSpecMetaName, "spec", "template", "metadata", "name"); err != nil {
logger.Error("failed to set metadata name for spec to existing object: ", err)
updated = false
}
}

originalSpecMetaLabel, change := getNestedFieldCopyData(existing, desired, "spec", "template", "metadata", "labels")
if !change {
updated = true
if err := unstructured.SetNestedField(existing.Object, originalSpecMetaLabel, "spec", "template", "metadata", "labels"); err != nil {
logger.Error("failed to set metadata labels for spec to existing object: ", err)
updated = false
}
}

originalSpecMetaAnno, change := getNestedFieldCopyData(existing, desired, "spec", "template", "metadata", "annotations")
if !change {
updated = true
if err := unstructured.SetNestedField(existing.Object, originalSpecMetaAnno, "spec", "template", "metadata", "annotations"); err != nil {
logger.Error("failed to set metadata annotations for spec to existing object: ", err)
updated = false
}
}

var (
existingEnv, existingPorts, existingVolumeMount []interface{}
desiredEnv, desiredPorts, desiredVolumeMount []interface{}
desiredName, existingName, desiredImage, existingImage string
desiredArgs, existingArgs []string
existingResources, desiredResources interface{}
)

existingContainersData, _, _ := unstructured.NestedSlice(existing.Object, "spec", "template", "spec", "containers")
for i := range existingContainersData {
existingEnv, _, _ = unstructured.NestedSlice(existingContainersData[i].(map[string]interface{}), "env")
existingArgs, _, _ = unstructured.NestedStringSlice(existingContainersData[i].(map[string]interface{}), "args")
existingImage, _, _ = unstructured.NestedString(existingContainersData[i].(map[string]interface{}), "image")
existingName, _, _ = unstructured.NestedString(existingContainersData[i].(map[string]interface{}), "name")
existingPorts, _, _ = unstructured.NestedSlice(existingContainersData[i].(map[string]interface{}), "ports")
existingVolumeMount, _, _ = unstructured.NestedSlice(existingContainersData[i].(map[string]interface{}), "volumeMounts")
existingResources, _, _ = unstructured.NestedFieldCopy(existingContainersData[i].(map[string]interface{}), "resources")
}

desiredContainersData, _, _ := unstructured.NestedSlice(desired.Object, "spec", "template", "spec", "containers")
for i := range desiredContainersData {
desiredEnv, _, _ = unstructured.NestedSlice(desiredContainersData[i].(map[string]interface{}), "env")
desiredArgs, _, _ = unstructured.NestedStringSlice(desiredContainersData[i].(map[string]interface{}), "args")
desiredImage, _, _ = unstructured.NestedString(desiredContainersData[i].(map[string]interface{}), "image")
desiredName, _, _ = unstructured.NestedString(desiredContainersData[i].(map[string]interface{}), "name")
desiredPorts, _, _ = unstructured.NestedSlice(desiredContainersData[i].(map[string]interface{}), "ports")
desiredVolumeMount, _, _ = unstructured.NestedSlice(desiredContainersData[i].(map[string]interface{}), "volumeMounts")
desiredResources, _, _ = unstructured.NestedFieldCopy(desiredContainersData[i].(map[string]interface{}), "resources")
}

var cUpdated bool
if !reflect.DeepEqual(existingEnv, desiredEnv) {
cUpdated = true
for _, c := range existingEnv {
if err := unstructured.SetNestedSlice(c.(map[string]interface{}), desiredEnv, "env"); err != nil {
logger.Error("failed to set container env to existing object: ", err)
cUpdated = false
}
}
}
if !reflect.DeepEqual(existingArgs, desiredArgs) {
res := make(map[string]interface{})
cUpdated = true
for _, c := range existingArgs {
res[c] = c
}
if err := unstructured.SetNestedStringSlice(res, desiredArgs, "args"); err != nil {
logger.Error("failed to set container args to existing object: ", err)
cUpdated = false
}
}
if !reflect.DeepEqual(existingImage, desiredImage) {
cUpdated = true
res := make(map[string]interface{})
res[existingImage] = existingImage
if err := unstructured.SetNestedField(res, desiredImage, "image"); err != nil {
logger.Error("failed to set container image to existing object: ", err)
cUpdated = false
}
}
if !reflect.DeepEqual(existingName, desiredName) {
cUpdated = true
res := make(map[string]interface{})
res[existingName] = existingName
if err := unstructured.SetNestedField(res, desiredName, "name"); err != nil {
logger.Error("failed to set container name to existing object: ", err)
cUpdated = false
}
}
if !reflect.DeepEqual(existingPorts, desiredPorts) {
cUpdated = true
for _, c := range existingPorts {
if err := unstructured.SetNestedSlice(c.(map[string]interface{}), desiredPorts, "ports"); err != nil {
logger.Error("failed to set container ports to existing object: ", err)
cUpdated = false
}
}
}
if !reflect.DeepEqual(existingVolumeMount, desiredVolumeMount) {
cUpdated = true
for _, c := range existingVolumeMount {
if err := unstructured.SetNestedSlice(c.(map[string]interface{}), desiredVolumeMount, "volumeMounts"); err != nil {
logger.Error("failed to set container volumeMount to existing object: ", err)
cUpdated = false
}
}
}
if !reflect.DeepEqual(existingResources, desiredResources) {
cUpdated = true
if err := unstructured.SetNestedField(existingResources.(map[string]interface{}), desiredResources, "resources"); err != nil {
logger.Error("failed to set container resources to existing object: ", err)
cUpdated = false
}
}
if cUpdated {
updated = true
err := unstructured.SetNestedField(existing.Object, desiredContainersData, "spec", "template", "spec", "containers")
if err != nil {
updated = false
}
}
desiredSA, change := getNestedFieldCopyData(existing, desired, "spec", "template", "spec", "serviceAccountName")
if !change {
updated = true
if err := unstructured.SetNestedField(existing.Object, desiredSA, "spec", "template", "spec", "serviceAccountName"); err != nil {
logger.Error("failed to set service account to existing object: ", err)
updated = false
}
}
desiredVol, change := getNestedFieldCopyData(existing, desired, "spec", "template", "spec", "volumes")
if !change {
updated = true
if err := unstructured.SetNestedField(existing.Object, desiredVol, "spec", "template", "spec", "volumes"); err != nil {
logger.Error("failed to set volumes to existing object: ", err)
updated = false
}
}
desiredTolerations, change := getNestedFieldCopyData(existing, desired, "spec", "template", "spec", "tolerations")
if !change {
updated = true
if err := unstructured.SetNestedField(existing.Object, desiredTolerations, "spec", "template", "spec", "tolerations"); err != nil {
logger.Error("failed to set tolerations to existing object: ", err)
updated = false
}
}
desiredNodeSelector, change := getNestedFieldCopyData(existing, desired, "spec", "template", "spec", "nodeSelector")
if !change {
updated = true
if err := unstructured.SetNestedField(existing.Object, desiredNodeSelector, "spec", "template", "spec", "nodeSelector"); err != nil {
logger.Error("failed to set nodeSelector to existing object: ", err)
updated = false
}
}
return
}

func getNestedFieldCopyData(existing, desired *unstructured.Unstructured, fields ...string) (interface{}, bool) {
updated, _, _ := unstructured.NestedFieldCopy(existing.Object, fields...)
original, _, _ := unstructured.NestedFieldCopy(desired.Object, fields...)
return original, reflect.DeepEqual(original, updated)
}

// MergeMaps merges the values in the passed maps into a new map.
// Values within m2 potentially clobber m1 values.
func MergeMaps(m1, m2 map[string]string) map[string]string {
merged := make(map[string]string, len(m1)+len(m2))
for k, v := range m1 {
merged[k] = v
}
for k, v := range m2 {
merged[k] = v
}
return merged
}

func GetConditions(existingData *unstructured.Unstructured) (v1beta1.Conditions, interface{}, error) {
statusData, ok, err := unstructured.NestedMap(existingData.Object, "status")
if !ok || err != nil {
Expand Down
Loading

0 comments on commit f269eda

Please sign in to comment.