fix: Fix bug in configbind pkg #1861
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michaljurecko
force-pushed
the
michaljurecko-PSGO-591-configbind-fix
branch
from
2db01cb to
8cec13a
Compare
build: Stream service release - all components
michaljurecko
commented
Jul 1, 2024
Comment on lines
-354
to
+357
| // Copy leaf values | ||
| if _, ok := v.(*orderedmap.OrderedMap); !ok { | ||
| // Copy leaf values = value is not object AND key is map step, not slice step | ||
| _, isObject := v.(*orderedmap.OrderedMap) | ||
| _, isMapKey := path.Last().(orderedmap.MapStep) | ||
| if !isObject && isMapKey { |
There was a problem hiding this comment.
Before fix, the code was stepping down to slice items, in the configuration structure.
Apps Proxy Kubernetes Diff [CI]Between Expand--- /tmp/artifacts/test-k8s-state.old.json.processed.kv 2024-07-01 13:16:49.841380711 +0000
+++ /tmp/artifacts/test-k8s-state.new.json.processed.kv 2024-07-01 13:16:49.965381083 +0000
@@ -105 +105 @@
-<Deployment/apps-proxy>.spec.template.spec.containers[0].image = "docker.io/keboola/apps-proxy:4f1bc71";
+<Deployment/apps-proxy>.spec.template.spec.containers[0].image = "docker.io/keboola/apps-proxy:8e1937a-1719839554";
@@ -461,3 +461,3 @@
-<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:4f1bc71";
-<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:4f1bc71";
-<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:4f1bc71";
+<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:8e1937a-1719839554";
+<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:8e1937a-1719839554";
+<Pod/apps-proxy-<hash>>.spec.containers[0].image = "docker.io/keboola/apps-proxy:8e1937a-1719839554";
@@ -879 +879 @@
-<ReplicaSet/apps-proxy-<hash>>.spec.template.spec.containers[0].image = "docker.io/keboola/apps-proxy:4f1bc71";
+<ReplicaSet/apps-proxy-<hash>>.spec.template.spec.containers[0].image = "docker.io/keboola/apps-proxy:8e1937a-1719839554";
(see artifacts in the Github Action for more information) |
Templates API Kubernetes Diff [CI]Between Expand--- /tmp/artifacts/test-k8s-state.old.json.processed.kv 2024-07-01 13:18:40.344775132 +0000
+++ /tmp/artifacts/test-k8s-state.new.json.processed.kv 2024-07-01 13:18:40.556777166 +0000
@@ -79 +79 @@
-<CronJob/templates-api-etcd-defrag>.spec.jobTemplate.spec.template.spec.containers[0].image = "docker.io/bitnami/etcd:3.5.11-debian-11-r3";
+<CronJob/templates-api-etcd-defrag>.spec.jobTemplate.spec.template.spec.containers[0].image = "docker.io/bitnami/etcd:3.5.14-debian-12-r1";
@@ -194 +194 @@
-<Deployment/templates-api>.spec.template.spec.containers[0].image = "docker.io/keboola/templates-api:4f1bc71";
+<Deployment/templates-api>.spec.template.spec.containers[0].image = "docker.io/keboola/templates-api:8e1937a-1719839597";
@@ -747,3 +747,3 @@
-<Pod/templates-api-<hash>>.spec.containers[0].image = "docker.io/keboola/templates-api:4f1bc71";
-<Pod/templates-api-<hash>>.spec.containers[0].image = "docker.io/keboola/templates-api:4f1bc71";
-<Pod/templates-api-<hash>>.spec.containers[0].image = "docker.io/keboola/templates-api:4f1bc71";
+<Pod/templates-api-<hash>>.spec.containers[0].image = "docker.io/keboola/templates-api:8e1937a-1719839597";
+<Pod/templates-api-<hash>>.spec.containers[0].image = "docker.io/keboola/templates-api:8e1937a-1719839597";
+<Pod/templates-api-<hash>>.spec.containers[0].image = "docker.io/keboola/templates-api:8e1937a-1719839597";
@@ -1154,0 +1155,3 @@
+<Pod/templates-api-etcd-0>.spec.containers[0].env[24] = {};
+<Pod/templates-api-etcd-0>.spec.containers[0].env[24].name = "GOMEMLIMIT";
+<Pod/templates-api-etcd-0>.spec.containers[0].env[24].value = "256MiB";
@@ -1182 +1185 @@
-<Pod/templates-api-etcd-0>.spec.containers[0].image = "docker.io/bitnami/etcd:3.5.11-debian-11-r3";
+<Pod/templates-api-etcd-0>.spec.containers[0].image = "docker.io/bitnami/etcd:3.5.14-debian-12-r1";
@@ -1210,0 +1214,4 @@
+<Pod/templates-api-etcd-0>.spec.containers[0].resources.limits = {};
+<Pod/templates-api-etcd-0>.spec.containers[0].resources.limits.memory = "256Mi";
+<Pod/templates-api-etcd-0>.spec.containers[0].resources.requests = {};
+<Pod/templates-api-etcd-0>.spec.containers[0].resources.requests.memory = "256Mi";
@@ -1219 +1226 @@
-<Pod/templates-api-etcd-0>.spec.containers[0].startupProbe.failureThreshold = 60;
+<Pod/templates-api-etcd-0>.spec.containers[0].startupProbe.failureThreshold = 300;
@@ -1407 +1414 @@
-<ReplicaSet/templates-api-<hash>>.spec.template.spec.containers[0].image = "docker.io/keboola/templates-api:4f1bc71";
+<ReplicaSet/templates-api-<hash>>.spec.template.spec.containers[0].image = "docker.io/keboola/templates-api:8e1937a-1719839597";
@@ -1478,0 +1486,12 @@
+<Secret/sh.helm.release.v1.templates-api-etcd.v2> = {};
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.apiVersion = "v1";
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.data = {};
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.kind = "Secret";
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.metadata = {};
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.metadata.labels = {};
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.metadata.labels.name = "templates-api-etcd";
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.metadata.labels.owner = "helm";
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.metadata.labels.version = "2";
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.metadata.name = "sh.helm.release.v1.templates-api-etcd.v2";
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.metadata.namespace = "templates-api";
+<Secret/sh.helm.release.v1.templates-api-etcd.v2>.type = "helm.sh/release.v1";
@@ -1709,0 +1729,3 @@
+<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].env[24] = {};
+<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].env[24].name = "GOMEMLIMIT";
+<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].env[24].value = "256MiB";
@@ -1737 +1759 @@
-<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].image = "docker.io/bitnami/etcd:3.5.11-debian-11-r3";
+<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].image = "docker.io/bitnami/etcd:3.5.14-debian-12-r1";
@@ -1765,0 +1788,4 @@
+<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].resources.limits = {};
+<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].resources.limits.memory = "256Mi";
+<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].resources.requests = {};
+<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].resources.requests.memory = "256Mi";
@@ -1774 +1800 @@
-<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].startupProbe.failureThreshold = 60;
+<StatefulSet/templates-api-etcd>.spec.template.spec.containers[0].startupProbe.failureThreshold = 300;
(see artifacts in the Github Action for more information) |
jachym-tousek-keboola
approved these changes
Jul 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Jira: https://keboola.atlassian.net/browse/PSGO-597
Changes:
(only first commit)