Commit Graph

226 Commits

Author SHA1 Message Date
yuefanxiao
22d9233f8b fix: resolve env_file variable interpolation issues by adding support for and default syntax 2025-05-08 01:23:08 +08:00
robertaistleitner
1b29e031e3
Fix ConfigMap name clash if env_file name is equal (#2001)
* Fix ConfigMap name clash if env_file name is equal #2000

* Generate envFrom instead of single env entries from env_file entries #1999

* Fix failing test fixture outputs
2025-04-15 11:39:45 -04:00
Kubernetes Prow Robot
62d33c426c
Merge pull request #1952 from jvitor83/feature/config-content
Add support for content in config
2024-12-02 13:12:59 +00:00
João Vitor Paes de Barros do Carmo
a49542010e docs: correcting the method name 2024-11-29 00:16:35 +00:00
João Vitor Paes de Barros do Carmo
5c1b3ad354 feat(config-content): added support for content in config 2024-11-29 00:16:23 +00:00
Ludger
d529bb9c41 clean double to lower 2024-10-30 23:37:49 +01:00
Ludger
470fb50146 fix upercas issue 2024-10-30 23:27:42 +01:00
Ludger Pottmeier
a103f37f4a
Update kubernetes.go
Fix issue #1942
2024-10-25 00:12:30 +02:00
Charlie Drage
55b077ab04
cleanup: removes uneeded annotation when not using network policy (#1884)
#### What type of PR is this?

<!--
Add one of the following kinds:
/kind bug
/kind documentation
/kind feature
-->

/kind cleanup

#### What this PR does / why we need it:

Removes the network policy annotation which is not needed (we are not
generating network policy)

#### Which issue(s) this PR fixes:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes https://github.com/kubernetes/kompose/issues/1759

#### Special notes for your reviewer:
2024-06-02 20:46:57 +02:00
TessaIO
3bf98301f7
fix: expose container to host only with labels (#1880)
Signed-off-by: ahmed.g <ahmed.g@adjoe.io>
Signed-off-by: TessaIO <ahmedgrati1999@gmail.com>
2024-05-29 16:05:04 -04:00
Charlie Drage
50e0408f6f
update references to just compose (#1869)
#### What type of PR is this?

Change from Docker Compose references to just Compose

<!--
Add one of the following kinds:
/kind bug
/kind cleanup
/kind documentation
/kind feature
-->

#### What this PR does / why we need it:

Compose is an open format and we should not say "Docker Compose".

#### Which issue(s) this PR fixes:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->

Fixes https://github.com/kubernetes/kompose/issues/1868

#### Special notes for your reviewer:

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
2024-04-26 10:24:55 +02:00
jose luis
19860cbea3
update k8s api and apimachinery
Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-04-25 23:41:42 +02:00
jose luis
3c189aaff1
Merge branch 'main' into feature-1846-network_mode-service
Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-04-25 17:31:49 +02:00
jose luis
8ee944c2be
Merge branch 'main' into feature-1846-network_mode-service 2024-04-22 15:46:45 +02:00
jose luis
bbd91be049
Merge branch 'main' into feature-1794-auto-configmaps
Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-04-22 13:37:00 +02:00
Kubernetes Prow Robot
cdcb0e7f61
Merge pull request #1847 from sosan/feature-1631-add-hpa
Feature 1635 - added labels to generate HPA
2024-04-19 05:24:52 -07:00
jose luis
e9f64cfd81
added more e2e, more tests
fallback to skip volume mount and log warning when path cannot be resolved, as /sys, /root, /var/lib/docker

in e2e TestMultipleContainersInPod directory /data replaced with /data-dir

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-04-10 00:33:57 +02:00
jose luis
4cd0b268fc
add configmaps derived from file and dir
add tests and e2e
function isconfigfile check if we need to use configmap and mount in readonly
readonly not asigned because not fail e2e

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-04-07 21:18:01 +02:00
jose luis
8ff0f334eb
fix EOF, DefaultMaxReplicas set to 3, extended user guide about hpa, more tests
add warning in situations like:
- maxreplicas < minreplicas
- value from label < 0
- validate percentage in cpu, memory metrics
2024-04-04 20:21:00 +02:00
jose luis
58974092a5
add networkmode service:
added tests
fixNetworkModeToService is responsible for adjusting the network mode of services in docker compose (services:) and generate a mapping of deployments based on the network mode of each service merging containers into the destination deployment, and removing transferred deployments

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-03-30 21:17:47 +01:00
jose luis
a38f7f9ea3
added this labels:
kompose.hpa.minreplicas
kompose.hpa.maxreplicas
kompose.hpa.cpu
kompose.hpa.memory

documentated labels user_guide.md

generate custom metrics from cpu, memory and set min/max replicas

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-03-26 20:58:57 +01:00
Ambrose Chua
ea485a7806
chore(deps): bump github.com/compose-spec/compose-go 2024-03-19 14:34:58 +08:00
Kubernetes Prow Robot
b2514e1c81
Merge pull request #1831 from realgam3/fix-configmap-volumes
fix issues #1829, #1830
2024-02-20 20:45:04 -08:00
Jose Luis
c0f7e910c8
in case /run/secrets/MARIADB_PASSWORD and secrets: MARIADB_PASSWORD are in uppercase, reformat the value of MARIADB_PASSWORD to mariadb-password. Also, reformat the secretconfig of the secrets. getSecretPathsLegacy returns secretSubPath. (#1826)
Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-02-20 23:35:18 -05:00
Tomer Zait
db6a4d7ce1 fix issues #1829, #1830 2024-02-18 10:50:15 +02:00
Jose Luis
182e0ce294
Merge branch 'kubernetes:main' into fix-issue-1778 2024-02-07 18:35:28 +01:00
jose luis
b544c17472
fix issue 1778
* fix issue https://github.com/kubernetes/kompose/issues/1778
*add tests with hardcoded values to mokup file access

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-01-27 18:47:54 +01:00
jose luis
578fa72a9a
fix issue 1793
* fix issue 1793  https://github.com/kubernetes/kompose/issues/1793
*add tests

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

formated k8utils_test.go

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

labels formatted as name"-"envName to match fixtures when performing the gitHub action

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

removed this piece code because apply it later, and it is redundant

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

Refactor test in k8sutils_test.go to extract the last 63 characters. This addresses the impact of the removed code that previously truncated the input with if len(envName) > 63 { envName = envName[len(envName)-63:] }

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

changed to name function to getUsableNameEnvFile

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

fix issue 1793

* fix issue 1793  https://github.com/kubernetes/kompose/issues/1793
*add tests

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

labels formatted as name"-"envName to match fixtures when performing the gitHub action

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>

changed to name function to getUsableNameEnvFile

Signed-off-by: jose luis <2064537+sosan@users.noreply.github.com>
2024-01-24 23:41:01 +01:00
Tomer Zait
cd6a318896 Add Labels for CronJob https://github.com/kubernetes/kompose/issues/1795 2024-01-16 23:44:49 +02:00
Tomer Zait
92ca12ae5b
fix issue https://github.com/kubernetes/kompose/issues/1683 (#1684)
* fix issue https://github.com/kubernetes/kompose/issues/1683

* add tests, die if inputfiles not specified

* fix GetComposeFileDir function and use it

* use fixed GetComposeFileDir instead of filepath.Dir

* return error instead of fatal

* add pod configmap creation to openshift
2024-01-02 14:48:59 -05:00
AhmedGrati
53de2c44fd fix failing unit tests
Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
2023-10-24 23:08:34 +01:00
AhmedGrati
3172bc05b5 fix: remove e2e flakiness by making the loop deterministic
Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
2023-10-24 16:19:22 +01:00
Charlie Drage
09dc978e8e
only add namespace if specified (#1731)
#### What type of PR is this?

<!--
Add one of the following kinds:
/kind cleanup
/kind documentation
/kind feature
-->

/kind bug

#### What this PR does / why we need it:

When we generate the YAML, we should NOT add namespace by default,
namespace should only be added if it has been specified via the command
line.

#### Which issue(s) this PR fixes:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->

Fixes https://github.com/kubernetes/kompose/issues/1729

#### Special notes for your reviewer:

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
2023-10-11 10:29:55 -04:00
AhmedGrati
1f1fc20204
Fix loading env file (#1679)
* fix: update loading 'env_file' of docker_compose

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* test: add functional tests for loading env_file

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

---------

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
2023-07-26 14:03:15 -04:00
AhmedGrati
b6b708b637
Feat add ns generation (#1667)
* feat: add ns generation for k8s

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* feat: add ns generation for openshift

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* test: add functional tests

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* fix: remove some code nits

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

---------

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
2023-07-16 22:59:16 +01:00
AhmedGrati
b0d46a4ce3
Feat add custom build push (#1630)
* feat: support custom build and push commands

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* test: add functional tests of the support of custom build and push

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* docs: add docs of the support of custom build and push

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

---------

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
2023-07-05 11:37:28 +01:00
AhmedGrati
f7bee839ce
feat: disable network policies generation by default (#1629)
* feat: disable network policies default generation

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* docs: add the generate-network-policies flag to user guide

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* test: add unit tests of the network policies generation

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

---------

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
2023-07-05 11:26:37 +01:00
AhmedGrati
485cd2f163
feat: support container volume mount subpath (#1628)
* feat: support volumes subpath

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* docs: add the kompose.volume.sub-path label

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* fix: update e2e tests

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

---------

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
2023-07-05 10:47:01 +01:00
AhmedGrati
6be6fdd165 feat: support external traffic policy
Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
2023-02-13 14:59:46 +01:00
AhmedGrati
9ab4ef3a9c
Feat: Add hostPort and protocol to containers (#1558)
* feat: add the host port to containers

* test(unit): add unit tests for host port and protocol

* test(functional): add functional tests of host port and protocol

* test(functional): add functional tests of host port and protocol for openshift
2023-02-08 15:46:13 -05:00
Lctrs
cb41c16bf4
chore: require go >=1.18, bump deps and get rid of replace directives (#1552) 2023-01-13 08:50:28 -05:00
Lctrs
2ad5745d58
feat: migrate from libcompose to compose-go (#1547)
* feat: migrate from libcompose to compose-go

libcompose has been deprecated since summer 2021 in favor of https://github.com/compose-spec/compose-go.
Kompose should now be able to load all versions of compose.

* chore: replace golint with staticcheck

golint has been deprecated. Recommended replacement is staticcheck.
2023-01-12 15:17:22 -05:00
AhmedGrati
36593e8759
Update e2e tests (#1538)
* fix: update ingress class name assign
2022-11-21 18:54:28 +08:00
AhmedGrati
acb8046f84
Fix environment variables interpolation (#1524) 2022-11-19 10:35:33 +08:00
AhmedGrati
fd7b751564
Fix container name (#1528)
* fix: update get container name function
* test: add a test for the introduced fix
2022-11-13 21:33:47 +08:00
Kubernetes Prow Robot
20fbab4c5c
Merge pull request #1478 from campos-ddc/fix-secret-file-locations
Fixed secret file locations to match results from docker-compose when using file-based secrets
2022-08-29 08:00:37 -07:00
Kubernetes Prow Robot
9055f21620
Merge pull request #1512 from realgam3/master
fix daemonset creation (add selector)
2022-08-23 04:49:25 -07:00
AhmedGrati
6512dd3dd4
fix: change the port ID definition in kubernetes.go file (#1515) 2022-08-16 07:57:43 -04:00
Tomer Zait
06bb4f5279 fix daemonset creation (add selector) 2022-07-01 01:21:33 +03:00
Sergey Shevchenko
98578640c0
Add kompose.service.expose.ingress-class-name (#1486)
Signed-off-by: Sergey Shevchenko <shevchenko@simple.life>
2022-03-15 10:51:00 -04:00