Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package okteto for openSUSE:Factory checked
in at 2023-08-06 16:30:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/okteto (Old)
and /work/SRC/openSUSE:Factory/.okteto.new.22712 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okteto"
Sun Aug 6 16:30:02 2023 rev:57 rq:1102547 version:2.18.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/okteto/okteto.changes 2023-07-18
22:09:04.963310457 +0200
+++ /work/SRC/openSUSE:Factory/.okteto.new.22712/okteto.changes 2023-08-06
16:30:23.844005446 +0200
@@ -1,0 +2,7 @@
+Sun Aug 06 07:54:57 UTC 2023 - ka...@b1-systems.de
+
+- Update to version 2.18.1:
+ * [Backport release-2.18] fix: compute build envs in local
+ (#3883)
+
+-------------------------------------------------------------------
Old:
----
okteto-2.18.0.obscpio
New:
----
okteto-2.18.1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ okteto.spec ++++++
--- /var/tmp/diff_new_pack.rAxCSk/_old 2023-08-06 16:30:26.980024453 +0200
+++ /var/tmp/diff_new_pack.rAxCSk/_new 2023-08-06 16:30:26.984024478 +0200
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: okteto
-Version: 2.18.0
+Version: 2.18.1
Release: 0
Summary: Develop your applications directly in your Kubernetes Cluster
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.rAxCSk/_old 2023-08-06 16:30:27.024024720 +0200
+++ /var/tmp/diff_new_pack.rAxCSk/_new 2023-08-06 16:30:27.028024745 +0200
@@ -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.18.0</param>
+ <param name="revision">2.18.1</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
- <param name="match-tag">2.18.0</param>
+ <param name="match-tag">2.18.1</param>
</service>
<service name="set_version" mode="disabled">
<param name="basename">okteto</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.rAxCSk/_old 2023-08-06 16:30:27.056024914 +0200
+++ /var/tmp/diff_new_pack.rAxCSk/_new 2023-08-06 16:30:27.060024938 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/okteto/okteto</param>
- <param
name="changesrevision">485b2be6406313888e0b6776ef098fba5a750864</param></service></servicedata>
+ <param
name="changesrevision">b49c71d933ab7241c45957c9cf66eb373e566a0c</param></service></servicedata>
(No newline at EOF)
++++++ okteto-2.18.0.obscpio -> okteto-2.18.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/okteto-2.18.0/cmd/deploy/remote.go
new/okteto-2.18.1/cmd/deploy/remote.go
--- old/okteto-2.18.0/cmd/deploy/remote.go 2023-07-13 15:29:44.000000000
+0200
+++ new/okteto-2.18.1/cmd/deploy/remote.go 2023-08-04 12:31:05.000000000
+0200
@@ -55,6 +55,7 @@
ENV PATH="${PATH}:/okteto/bin"
COPY --from=okteto-cli /usr/local/bin/* /okteto/bin/
+
ENV {{ .RemoteDeployEnvVar }} true
ARG {{ .NamespaceArgName }}
ARG {{ .ContextArgName }}
@@ -68,6 +69,10 @@
COPY . /okteto/src
WORKDIR /okteto/src
+{{range $key, $val := .OktetoBuildEnvVars }}
+ENV {{$key}} {{$val}}
+{{end}}
+
ARG {{ .GitCommitArgName }}
ARG {{ .InvalidateCacheArgName }}
@@ -81,6 +86,7 @@
OktetoCLIImage string
UserDeployImage string
RemoteDeployEnvVar string
+ OktetoBuildEnvVars map[string]string
ContextArgName string
NamespaceArgName string
TokenArgName string
@@ -93,7 +99,7 @@
}
type remoteDeployCommand struct {
- builderV2 *buildv2.OktetoBuilder
+ getBuildEnvVars func() map[string]string
builderV1 builder.Builder
fs afero.Fs
workingDirectoryCtrl filesystem.WorkingDirectoryInterface
@@ -111,7 +117,7 @@
func newRemoteDeployer(builder *buildv2.OktetoBuilder) *remoteDeployCommand {
fs := afero.NewOsFs()
return &remoteDeployCommand{
- builderV2: builder,
+ getBuildEnvVars: builder.GetBuildEnvVars,
builderV1: remoteBuild.NewBuilderFromScratch(),
fs: fs,
workingDirectoryCtrl: filesystem.NewOsWorkingDirectoryCtrl(),
@@ -258,6 +264,7 @@
UserDeployImage: opts.Manifest.Deploy.Image,
RemoteDeployEnvVar: constants.OktetoDeployRemote,
ContextArgName: model.OktetoContextEnvVar,
+ OktetoBuildEnvVars: rd.getBuildEnvVars(),
NamespaceArgName: model.OktetoNamespaceEnvVar,
TlsCertBase64ArgName: constants.OktetoTlsCertBase64EnvVar,
InternalServerName:
constants.OktetoInternalServerNameEnvVar,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/okteto-2.18.0/cmd/deploy/remote_test.go
new/okteto-2.18.1/cmd/deploy/remote_test.go
--- old/okteto-2.18.0/cmd/deploy/remote_test.go 2023-07-13 15:29:44.000000000
+0200
+++ new/okteto-2.18.1/cmd/deploy/remote_test.go 2023-08-04 12:31:05.000000000
+0200
@@ -21,7 +21,6 @@
"testing"
"time"
- v2 "github.com/okteto/okteto/cmd/build/v2"
"github.com/okteto/okteto/pkg/cmd/build"
"github.com/okteto/okteto/pkg/constants"
oktetoErrors "github.com/okteto/okteto/pkg/errors"
@@ -143,9 +142,6 @@
wdCtrl.SetErrors(tt.config.wd)
tempCreator.SetError(tt.config.tempFsCreator)
rdc := remoteDeployCommand{
- builderV2: &v2.OktetoBuilder{
- Registry: newFakeRegistry(),
- },
builderV1: fakeBuilder{err:
tt.config.builderErr},
fs: fs,
workingDirectoryCtrl: wdCtrl,
@@ -153,6 +149,7 @@
clusterMetadata: func(context.Context)
(*types.ClusterMetadata, error) {
return
&types.ClusterMetadata{Certificate: tt.config.cert}, nil
},
+ getBuildEnvVars: func() map[string]string {
return nil },
}
err := rdc.deploy(ctx, tt.config.options)
if tt.expected != nil {
@@ -187,11 +184,9 @@
os.Unsetenv(envvarName)
}()
rdc := remoteDeployCommand{
- sshAuthSockEnvvar: envvarName,
- knownHostsPath: knowHostFile.Name(),
- builderV2: &v2.OktetoBuilder{
- Registry: newFakeRegistry(),
- },
+ sshAuthSockEnvvar: envvarName,
+ getBuildEnvVars: func() map[string]string { return nil },
+ knownHostsPath: knowHostFile.Name(),
builderV1: fakeBuilder{assertOptions: assertFn},
fs: fs,
workingDirectoryCtrl:
filesystem.NewFakeWorkingDirectoryCtrl(filepath.Clean("/")),
@@ -227,11 +222,8 @@
os.Unsetenv(envvarName)
}()
rdc := remoteDeployCommand{
- sshAuthSockEnvvar: envvarName,
- knownHostsPath: "inexistent-file",
- builderV2: &v2.OktetoBuilder{
- Registry: newFakeRegistry(),
- },
+ sshAuthSockEnvvar: envvarName,
+ knownHostsPath: "inexistent-file",
builderV1: fakeBuilder{assertOptions: assertFn},
fs: fs,
workingDirectoryCtrl:
filesystem.NewFakeWorkingDirectoryCtrl(filepath.Clean("/")),
@@ -239,6 +231,7 @@
clusterMetadata: func(context.Context) (*types.ClusterMetadata,
error) {
return &types.ClusterMetadata{}, nil
},
+ getBuildEnvVars: func() map[string]string { return nil },
}
err := rdc.deploy(context.Background(), &Options{
@@ -355,8 +348,10 @@
opts *Options
}
type expected struct {
- dockerfileName string
- err error
+ dockerfileName string
+ dockerfileContent string
+ buildEnvVars map[string]string
+ err error
}
var tests = []struct {
name string
@@ -384,6 +379,42 @@
},
expected: expected{
dockerfileName:
filepath.Clean("/test/Dockerfile.deploy"),
+ dockerfileContent: `
+FROM okteto/okteto:latest as okteto-cli
+
+FROM test-image as deploy
+
+ENV PATH="${PATH}:/okteto/bin"
+COPY --from=okteto-cli /usr/local/bin/* /okteto/bin/
+
+
+ENV OKTETO_DEPLOY_REMOTE true
+ARG OKTETO_NAMESPACE
+ARG OKTETO_CONTEXT
+ARG OKTETO_TOKEN
+ARG OKTETO_ACTION_NAME
+ARG OKTETO_TLS_CERT_BASE64
+ARG INTERNAL_SERVER_NAME
+RUN mkdir -p /etc/ssl/certs/
+RUN echo "$OKTETO_TLS_CERT_BASE64" | base64 -d > /etc/ssl/certs/okteto.crt
+
+COPY . /okteto/src
+WORKDIR /okteto/src
+
+
+ENV OKTETO_BUIL_SVC2_IMAGE TWO_VALUE
+
+ENV OKTETO_BUIL_SVC_IMAGE ONE_VALUE
+
+
+ARG OKTETO_GIT_COMMIT
+ARG OKTETO_INVALIDATE_CACHE
+
+RUN --mount=type=secret,id=known_hosts --mount=id=remote,type=ssh \
+ mkdir -p $HOME/.ssh && echo "UserKnownHostsFile=/run/secrets/known_hosts" >>
$HOME/.ssh/config && \
+ okteto deploy --log-output=json --server-name="$INTERNAL_SERVER_NAME"
--timeout 0s
+`,
+ buildEnvVars:
map[string]string{"OKTETO_BUIL_SVC_IMAGE": "ONE_VALUE",
"OKTETO_BUIL_SVC2_IMAGE": "TWO_VALUE"},
},
},
}
@@ -392,7 +423,9 @@
t.Run(tt.name, func(t *testing.T) {
wdCtrl.SetErrors(tt.config.wd)
rdc := remoteDeployCommand{
- builderV2: &v2.OktetoBuilder{},
+ getBuildEnvVars: func() map[string]string {
+ return tt.expected.buildEnvVars
+ },
fs: fs,
workingDirectoryCtrl: wdCtrl,
}
@@ -400,6 +433,12 @@
assert.ErrorIs(t, err, tt.expected.err)
assert.Equal(t, tt.expected.dockerfileName,
dockerfileName)
+ if dockerfileName != "" {
+ bFile, err := afero.ReadFile(fs, dockerfileName)
+ assert.NoError(t, err)
+ assert.EqualValues(t,
tt.expected.dockerfileContent, string(bFile))
+ }
+
if tt.expected.err == nil {
_, err = rdc.fs.Stat(filepath.Join("/test",
dockerfileTemporalName))
assert.NoError(t, err)
++++++ okteto.obsinfo ++++++
--- /var/tmp/diff_new_pack.rAxCSk/_old 2023-08-06 16:30:27.360026757 +0200
+++ /var/tmp/diff_new_pack.rAxCSk/_new 2023-08-06 16:30:27.364026781 +0200
@@ -1,5 +1,5 @@
name: okteto
-version: 2.18.0
-mtime: 1689254984
-commit: 485b2be6406313888e0b6776ef098fba5a750864
+version: 2.18.1
+mtime: 1691145065
+commit: b49c71d933ab7241c45957c9cf66eb373e566a0c
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/okteto/vendor.tar.gz
/work/SRC/openSUSE:Factory/.okteto.new.22712/vendor.tar.gz differ: char 5, line
1
