Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package okteto for openSUSE:Factory checked
in at 2024-01-07 21:42:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/okteto (Old)
and /work/SRC/openSUSE:Factory/.okteto.new.28375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okteto"
Sun Jan 7 21:42:19 2024 rev:67 rq:1137402 version:2.23.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/okteto/okteto.changes 2023-12-13
18:34:27.721294756 +0100
+++ /work/SRC/openSUSE:Factory/.okteto.new.28375/okteto.changes 2024-01-07
21:42:21.540507963 +0100
@@ -1,0 +2,7 @@
+Sun Jan 07 18:08:07 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 2.23.2:
+ * fix: do not fail if error retrieving envs from image (#4099)
+ (#4100)
+
+-------------------------------------------------------------------
Old:
----
okteto-2.23.1.obscpio
New:
----
okteto-2.23.2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ okteto.spec ++++++
--- /var/tmp/diff_new_pack.2Z1rRz/_old 2024-01-07 21:42:22.608546825 +0100
+++ /var/tmp/diff_new_pack.2Z1rRz/_new 2024-01-07 21:42:22.608546825 +0100
@@ -1,7 +1,7 @@
#
# spec file for package okteto
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: okteto
-Version: 2.23.1
+Version: 2.23.2
Release: 0
Summary: Develop your applications directly in your Kubernetes Cluster
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2Z1rRz/_old 2024-01-07 21:42:22.640547989 +0100
+++ /var/tmp/diff_new_pack.2Z1rRz/_new 2024-01-07 21:42:22.640547989 +0100
@@ -3,10 +3,10 @@
<param name="url">https://github.com/okteto/okteto</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">2.23.1</param>
+ <param name="revision">2.23.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
- <param name="match-tag">2.23.1</param>
+ <param name="match-tag">2.23.2</param>
</service>
<service name="set_version" mode="manual">
<param name="basename">okteto</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.2Z1rRz/_old 2024-01-07 21:42:22.660548717 +0100
+++ /var/tmp/diff_new_pack.2Z1rRz/_new 2024-01-07 21:42:22.664548862 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/okteto/okteto</param>
- <param
name="changesrevision">5736dda29a09fd253fa2ed5a0574ebdb4ff097c6</param></service></servicedata>
+ <param
name="changesrevision">cc3e71019898e5d6e875646736486ae067808060</param></service></servicedata>
(No newline at EOF)
++++++ okteto-2.23.1.obscpio -> okteto-2.23.2.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/okteto-2.23.1/cmd/up/exec.go
new/okteto-2.23.2/cmd/up/exec.go
--- old/okteto-2.23.1/cmd/up/exec.go 2023-12-12 16:27:56.000000000 +0100
+++ new/okteto-2.23.2/cmd/up/exec.go 2023-12-22 17:38:36.000000000 +0100
@@ -220,9 +220,15 @@
return nil, err
}
- imageEnvs, err :=
eg.imageEnvsGetter.getEnvsFromImage(apps.GetDevContainer(app.PodSpec(),
"").Image)
+ svcImage := apps.GetDevContainer(app.PodSpec(), "").Image
+ imageEnvs, err := eg.imageEnvsGetter.getEnvsFromImage(svcImage)
if err != nil {
- return nil, err
+ // we must not fail since the image may not be found because
the platform
+ // of the image executed in the pod might not match the local
platform used
+ // for the search.
+ reason := fmt.Sprintf("Could not to retrieve environment
variables from the image '%s'", svcImage)
+ oktetoLog.Debugf("%s: %s", reason, err.Error())
+ oktetoLog.Warning(reason)
}
envs = append(envs, imageEnvs...)
@@ -297,7 +303,7 @@
return envs, nil
}
-func (cmg *configMapGetter) getEnvsFromConfigMap(ctx context.Context, name
string, namespace string, client kubernetes.Interface) ([]string, error) {
+func (cmg *configMapGetter) getEnvsFromConfigMap(ctx context.Context, name,
namespace string, client kubernetes.Interface) ([]string, error) {
var envs []string
cmName := pipeline.TranslatePipelineName(name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/okteto-2.23.1/cmd/up/exec_test.go
new/okteto-2.23.2/cmd/up/exec_test.go
--- old/okteto-2.23.1/cmd/up/exec_test.go 2023-12-12 16:27:56.000000000
+0100
+++ new/okteto-2.23.2/cmd/up/exec_test.go 2023-12-22 17:38:36.000000000
+0100
@@ -43,11 +43,11 @@
envs []string
}
-func (f *fakeGetter) getEnvsFromDevContainer(ctx context.Context, spec
*apiv1.PodSpec, name string, namespace string, client kubernetes.Interface)
([]string, error) {
+func (f *fakeGetter) getEnvsFromDevContainer(ctx context.Context, spec
*apiv1.PodSpec, name, namespace string, client kubernetes.Interface) ([]string,
error) {
return f.envs, f.err
}
-func (f *fakeGetter) getEnvsFromConfigMap(ctx context.Context, name string,
namespace string, client kubernetes.Interface) ([]string, error) {
+func (f *fakeGetter) getEnvsFromConfigMap(ctx context.Context, name, namespace
string, client kubernetes.Interface) ([]string, error) {
return f.envs, f.err
}
@@ -224,6 +224,38 @@
},
},
},
+ {
+ name: "error retrieving envs from image",
+ client: fake.NewSimpleClientset(&appsv1.StatefulSet{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "test",
+ Namespace: "test",
+ },
+ Spec: appsv1.StatefulSetSpec{
+ Template: v1.PodTemplateSpec{
+ Spec: v1.PodSpec{
+ Containers:
[]v1.Container{
+ {
+
VolumeMounts: []v1.VolumeMount{
+
{
+
MountPath: "/data",
+
},
+ },
+ },
+ },
+ },
+ },
+ },
+ }),
+ fakeConfigMapEnvsGetter: fakeGetter{},
+ fakeSecretEnvsGetter: fakeGetter{},
+ fakeImageEnvsGetter: fakeGetter{err:
assert.AnError},
+ expectedEnvs: []string{},
+ dev: &model.Dev{
+ Name: "test",
+ Namespace: "test",
+ },
+ },
}
for _, tt := range tests {
@@ -300,33 +332,6 @@
},
}),
},
- {
- name: "error retrieving envs from image",
- client: fake.NewSimpleClientset(&appsv1.StatefulSet{
- ObjectMeta: metav1.ObjectMeta{
- Name: "test",
- Namespace: "test",
- },
- Spec: appsv1.StatefulSetSpec{
- Template: v1.PodTemplateSpec{
- Spec: v1.PodSpec{
- Containers:
[]v1.Container{
- {
-
VolumeMounts: []v1.VolumeMount{
-
{
-
MountPath: "/data",
-
},
- },
- },
- },
- },
- },
- },
- }),
- fakeConfigMapEnvsGetter: fakeGetter{},
- fakeSecretEnvsGetter: fakeGetter{},
- fakeImageEnvsGetter: fakeGetter{err:
assert.AnError},
- },
}
for _, tt := range tests {
++++++ okteto.obsinfo ++++++
--- /var/tmp/diff_new_pack.2Z1rRz/_old 2024-01-07 21:42:23.016561671 +0100
+++ /var/tmp/diff_new_pack.2Z1rRz/_new 2024-01-07 21:42:23.020561817 +0100
@@ -1,5 +1,5 @@
name: okteto
-version: 2.23.1
-mtime: 1702394876
-commit: 5736dda29a09fd253fa2ed5a0574ebdb4ff097c6
+version: 2.23.2
+mtime: 1703263116
+commit: cc3e71019898e5d6e875646736486ae067808060
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/okteto/vendor.tar.gz
/work/SRC/openSUSE:Factory/.okteto.new.28375/vendor.tar.gz differ: char 5, line
1
