Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: star3am/hashiqube
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: badj/hashiqube
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 13 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 11, 2023

  1. Update README.md 

    Multiple updates to improve spelling, grammar and formatting.
    @badj
    badj authored Oct 11, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    09527fb View commit details

  2. Merge pull request #1 from star3am/master 

    adding header img
    @badj
    badj authored Oct 11, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4eab9ed View commit details

  3. Update README.md 

    Updated hyperlink embedding with style color #bd93f9 and bold as the markdown hyperlink embedding was added but did not indicate embedded linking in content.
    @badj
    badj authored Oct 11, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6e42bdf View commit details

  4. Update README.md 

    Reverting the hyperlink embedding styling (experiment) changes that are not required. The CSS is already catering for it.
    @badj
    badj authored Oct 11, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3ff9567 View commit details

  5. Merge pull request #2 from badj/badj-website-markdown-style-updates 

    Update README.md
    @badj
    badj authored Oct 11, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c0bc123 View commit details

Commits on Oct 12, 2023

  1. removed hyperlink embed with strong markdown that caused css color ov… 

    …er-ride from #bd93f9 incorrectly to #34495e (grey)
    @jbadenhorstdoc
    jbadenhorstdoc committed Oct 12, 2023
    Copy the full SHA
    e783d19 View commit details

  2. Merge branch 'star3am:master' into master

    @badj
    badj authored Oct 12, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    029ea2c View commit details

Commits on Oct 19, 2023

  1. Finalised readme updates for feedback with the latest updates merged … 

    …from upstream master.
    @jbadenhorstdoc
    jbadenhorstdoc committed Oct 19, 2023
    Copy the full SHA
    2bad9ce View commit details

Commits on Oct 23, 2023

  1. Finalised readme updates for feedback with the latest updates merged … 

    …from upstream master.
    @jbadenhorstdoc
    jbadenhorstdoc committed Oct 23, 2023
    Copy the full SHA
    20ca0f9 View commit details

  2. Latest updates merged from upstream master.

    @jbadenhorstdoc
    jbadenhorstdoc committed Oct 23, 2023
    Copy the full SHA
    a8e1b67 View commit details

Commits on Oct 24, 2023

  1. Merge branch 'star3am:master' into master

    @badj
    badj authored Oct 24, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a07cdc9 View commit details

Commits on Oct 26, 2023

  1. Merge branch 'star3am:master' into master

    @badj
    badj authored Oct 26, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c61000c View commit details

Commits on Nov 9, 2023

  1. Merge branch 'star3am:master' into master

    @badj
    badj authored Nov 9, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e705673 View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 index.html
  2. +4 −4 jenkins/README.md
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>HashiQube - A DevOps Development Lab Using All the HashiCorp Products and other Popular Applications such as Docker, Kubernetes, Traefik, Ansible, AWX Tower and loads more.</title>
<title>HashiQube - A Development Lab Using All the HashiCorp Products and other Popular Applications such as Docker, Kubernetes, Traefik, Ansible, AWX Tower and loads more.</title>
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-LWNG2RV7KC"></script>
<script>
8 changes: 4 additions & 4 deletions jenkins/README.md
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Jenkins is an open source automation server. It helps automate the parts of soft

## About

This DevOps Jenkins Lab will help you with a practicle example of a Jenkinsfile pipeline to do the following:
This DevOps Jenkins Lab will help you with a practice example of a Jenkinsfile pipeline to do the following:

- Retrieve Secrets from Vault in Hashiqube
- Retrieve Secrets from HCP Vault Secrets (Hashicorp Cloud Platform)
@@ -16,13 +16,13 @@ This provisioner will help you start the Jenkins container, login with the initi

![Jenkins Logo](images/jenkins-logo.png?raw=true "Jenkins Logo")

We will also configure Jenkins to do the following for us:
We will also configure Jenkins to do the following for us:

- Clone https://github.com/star3am/terraform-hashicorp-hashiqube
- Install https://github.com/aquasecurity/tfsec Aquasec's TFSec and scan our modules
- Install Terraform and run Terraform Plan on Terraform Cloud
- Install Hashicorp Vault Plugin https://github.com/jenkinsci/hashicorp-vault-plugin
After that, we will configure Vault's secret engines, KV store version 1 and 2 and set some keys.
After that, we will configure Vault's secret engines, KV store version 1 and 2 and set some keys.

For this demo we will use the Vault root access token for Jenkins access. Other authentication methods like LDAP can be enabled later.

@@ -412,7 +412,7 @@ You will need to capture the following details from the Hashicorp Cloud Portal a

`YOUR_HCP_ORGANIZATION_NAME`

`YOUR_HCP_PROJECT_NAME`
`YOUR_HCP_PROJECT_NAME`

`YOUR_HCP_APP_NAME`