From 0c4220b42d7d26c59ddce59d212b93b4e2b82dcc Mon Sep 17 00:00:00 2001 From: Hunter Gerlach Date: Thu, 22 Jun 2023 09:30:30 -0400 Subject: [PATCH 01/10] Add guidance for using Workspace badge button --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f879897..a2bf7c6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +To get started, simply click the button below... [![Contribute](https://www.eclipse.org/che/contribute.svg)](https://workspaces.openshift.com/f?url=https://github.com/kyetter/demo/) # Ansible Development on OpenShift DevSpaces From 84cef0856ce768e77edd426d7b3f1c49448fe072 Mon Sep 17 00:00:00 2001 From: Hunter Gerlach Date: Thu, 22 Jun 2023 09:30:53 -0400 Subject: [PATCH 02/10] Improve formatting --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a2bf7c6..a327ac3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ To get started, simply click the button below... + [![Contribute](https://www.eclipse.org/che/contribute.svg)](https://workspaces.openshift.com/f?url=https://github.com/kyetter/demo/) # Ansible Development on OpenShift DevSpaces From 0f903325abdf72763c86b8a27d5c87018973436d Mon Sep 17 00:00:00 2001 From: Red Hat Devstudio Release Bot Date: Wed, 6 Sep 2023 17:46:38 -0400 Subject: [PATCH 03/10] chore(devfile) link v2 devfile to :3.9; set image refs to registry.redhat.io/devspaces/ Signed-off-by: Red Hat Devstudio Release Bot --- devfile.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devfile.yaml b/devfile.yaml index e635d64..91c0ee2 100644 --- a/devfile.yaml +++ b/devfile.yaml @@ -4,7 +4,7 @@ metadata: components: - name: tooling-container container: - image: quay.io/devspaces/ansible-creator-ee@sha256:5c789a6a1676fab6c753c3abc74f63c9898564711cdda5cc5274e8c2712fb436 + image: registry.redhat.io/devspaces/ansible-creator-ee@sha256:3.9c789a6a1676fab6c753c3abc74f63c9898564711cdda5cc5274e8c2712fb436 memoryRequest: 256M memoryLimit: 6Gi cpuRequest: 250m From 2ed22c91229ab12d1912fed5c741e7f547258009 Mon Sep 17 00:00:00 2001 From: Valerii Svydenko Date: Wed, 6 Sep 2023 21:48:08 +0000 Subject: [PATCH 04/10] chore(devfile):auto-update Ansible Creator EE image --- devfile.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devfile.yaml b/devfile.yaml index 91c0ee2..fd38664 100644 --- a/devfile.yaml +++ b/devfile.yaml @@ -4,7 +4,7 @@ metadata: components: - name: tooling-container container: - image: registry.redhat.io/devspaces/ansible-creator-ee@sha256:3.9c789a6a1676fab6c753c3abc74f63c9898564711cdda5cc5274e8c2712fb436 + image: quay.io/devspaces/ansible-creator-ee@sha256:e294e15b6476c7ddd14fc077af284f348fa952f52e402598d014e6fbb68a339b memoryRequest: 256M memoryLimit: 6Gi cpuRequest: 250m From 2320ba6f0e5a5ba422b2e13f8b545418c8dcba70 Mon Sep 17 00:00:00 2001 From: kyetter Date: Mon, 18 Sep 2023 10:25:13 -0400 Subject: [PATCH 05/10] merging README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a9ebb1..0edc6e7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ To get started, simply click the button below... -[![Contribute](https://www.eclipse.org/che/contribute.svg)](https://workspaces.openshift.com/f?url=https://github.com/kyetter/demo/) +[![Contribute](https://www.eclipse.org/che/contribute.svg)](https://workspaces.openshift.com/f?url=https://github.com/devspaces-samples/ansible-devspaces-demo) + # Ansible Development on OpenShift DevSpaces From bbe0788396a06bb577ee336997f5d0768f024a7c Mon Sep 17 00:00:00 2001 From: bontreger Date: Tue, 19 Sep 2023 21:51:01 -0400 Subject: [PATCH 06/10] testing some changes for che --- devfile.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/devfile.yaml b/devfile.yaml index fd38664..c24dc5d 100644 --- a/devfile.yaml +++ b/devfile.yaml @@ -37,6 +37,4 @@ commands: kind: run isDefault: true component: tooling-container -events: - postStart: - - "oc-install" + From 39361247227cde878c8ab2009a53efd83673e623 Mon Sep 17 00:00:00 2001 From: bontreger Date: Wed, 10 Jan 2024 16:49:31 -0500 Subject: [PATCH 07/10] Add gitleaks as part of the pre-commits for demonstrations --- .pre-commit-config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4ce6454..7f124aa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,3 +23,8 @@ repos: additional_dependencies: - "ansible-core>=2.13" - "yamllint>=1.29,<2.0" + + - repo: https://github.com/gitleaks/gitleaks + rev: v8.16.1 + hooks: + - id: gitleaks From 9cdc94bfa25bcce89ed25dbf23d4cae8f84b5f7b Mon Sep 17 00:00:00 2001 From: bontreger Date: Wed, 10 Jan 2024 21:35:45 -0500 Subject: [PATCH 08/10] Update Dockerfile with glibc-langpack-en --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 1873722..fc3695a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ RUN pip3 install -r requirements.txt ## kubectl RUN \ microdnf install -y which && \ + microdnf install -y glibc-langpack-en && \ microdnf clean all && \ curl -LO https://dl.k8s.io/release/`curl -LS https://dl.k8s.io/release/stable.txt`/bin/linux/amd64/kubectl && \ chmod +x ./kubectl && \ From a9502035260ecd7866da1b37fd03b49ec1752197 Mon Sep 17 00:00:00 2001 From: bontreger Date: Wed, 10 Jan 2024 21:45:17 -0500 Subject: [PATCH 09/10] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fc3695a..1873722 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,6 @@ RUN pip3 install -r requirements.txt ## kubectl RUN \ microdnf install -y which && \ - microdnf install -y glibc-langpack-en && \ microdnf clean all && \ curl -LO https://dl.k8s.io/release/`curl -LS https://dl.k8s.io/release/stable.txt`/bin/linux/amd64/kubectl && \ chmod +x ./kubectl && \ From ebb8b8a8cc61f607654c9815c665925ad79a953d Mon Sep 17 00:00:00 2001 From: bontreger Date: Wed, 28 Feb 2024 22:37:36 -0500 Subject: [PATCH 10/10] added go to the docker build for pre-commits --- Dockerfile | 3 +++ requirements.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1873722..d295263 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,9 @@ ENV HOME=/home/runner COPY requirements.txt requirements.txt RUN pip3 install -r requirements.txt +## install golang for pre-commit +RUN microdnf install -y go + ## kubectl RUN \ microdnf install -y which && \ diff --git a/requirements.txt b/requirements.txt index 528a000..7ca710b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ kubernetes==26.1.0 ansible-navigator==3.5.0 pre-commit==3.6.0 ansible-creator +