Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix issue 1778 #1799

Merged
merged 4 commits into from
Feb 12, 2024
Merged

fix issue 1778 #1799

merged 4 commits into from
Feb 12, 2024

Conversation

sosan
Copy link
Contributor

@sosan sosan commented Jan 10, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #1778

Special notes for your reviewer:

i runned action Kompose CI, but get error from action, i checked result and expect and it's very similar
https://github.com/sosan/kompose/actions/runs/7479241247/job/20355974505

convert::expect_success: 
Running: 'kompose -f /home/runner/work/kompose/kompose/script/test/fixtures/configmap-pod/docker-compose.yml convert --stdout --with-kompose-annotation=false' expected_output: '/home/runner/work/kompose/kompose/script/test/fixtures/configmap-pod/output-k8s.yaml'_ __ __ _| |_ _ / _|/ _| between /home/runner/work/kompose/kompose/script/test/fixtures/configmap-pod/output-k8s.yaml, 
four documents / _' | | | | |_| |_ and /tmp/kompose/test-stdout, 
four documents | (_| | |_| | _| _| \__,_|\__, |_| |_| returned five differences |___/ metadata (Service/default/redis) 

one map entry removed: creationTimestamp: null metadata (Pod/default/redis) - 
one map entry removed: creationTimestamp: null spec.containers.redis (Pod/default/redis) - 
one map entry removed: resources: {} metadata (ConfigMap/default/foo-env) - 
one map entry removed: creationTimestamp: null metadata (ConfigMap/default/bar-env) - 
one map entry removed: creationTimestamp: null
FAIL: converted output does not match

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 10, 2024
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 10, 2024
@AhmedGrati
Copy link
Contributor

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 14, 2024
@cdrage
Copy link
Member

cdrage commented Jan 15, 2024

/hold

I forget why this is on hold haha

@AhmedGrati
Copy link
Contributor

@cdrage e2e tests were failing, and I opened a PR to fix them. Can you please rebase @sosan?

@AhmedGrati
Copy link
Contributor

ping @sosan

@sosan
Copy link
Contributor Author

sosan commented Jan 22, 2024

@AhmedGrati yup

@AhmedGrati
Copy link
Contributor

@sosan can you rebase please?

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 22, 2024
@sosan
Copy link
Contributor Author

sosan commented Jan 22, 2024

@AhmedGrati done

@AhmedGrati
Copy link
Contributor

@sosan Same here, the rebase went wrong.

@sosan
fix issue 1778
b544c17 
* fix issue kubernetes#1778
*add tests with hardcoded values to mokup file access

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 27, 2024
@sosan
adds a unit test for the TestKubernetes_CreateSecrets function where …
b095982 
…secrets are created in Kubernetes from a KomposeObject, and secrets are taken from a CNAME file. Also, a newSecrets function is added to generate secrets from the provided configuration

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 7, 2024
cdrage
cdrage approved these changes Feb 12, 2024
View reviewed changes
Copy link
Member

@cdrage cdrage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much better and thank you for adding the tests. This LGTM!

@cdrage
Copy link
Member

cdrage commented Feb 12, 2024

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 12, 2024
@cdrage
Copy link
Member

cdrage commented Feb 12, 2024

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cdrage, sosan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 12, 2024
@cdrage cdrage removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 12, 2024
@k8s-ci-robot k8s-ci-robot merged commit b768a43 into kubernetes:main Feb 12, 2024
10 checks passed
sosan pushed a commit to sosan/kompose that referenced this pull request Feb 19, 2024
@k8s-ci-robot @sosan
Merge pull request kubernetes#1799 from sosan/fix-issue-1778
932c9b0 
fix issue 1778
@BrewTestBot BrewTestBot mentioned this pull request Apr 26, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdrage cdrage cdrage approved these changes

@hangyan hangyan Awaiting requested review from hangyan

@kadel kadel Awaiting requested review from kadel

Assignees

@cdrage cdrage

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG] Kompose does not mount secrets like compose
4 participants
@sosan @AhmedGrati @cdrage @k8s-ci-robot