Skip to content

Commit

Permalink
Use Conjur CLI v8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
szh committed Mar 8, 2023
1 parent 48ab8b1 commit 72442d3
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 23 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,19 @@ jobs:
strategy:
matrix:
kube-tag:
- v1.26.0
- v1.21.2
- v1.18.2
- v1.16.9
- v1.14.10
steps:
- name: Check out code
uses: actions/checkout@v2

- name: Install Helm
uses: azure/setup-helm@v1
uses: azure/setup-helm@v3
with:
version: v3.2.1

- name: Create k8s KinD Cluster
uses: helm/kind-action@v1.2.0
uses: helm/kind-action@v1.4.0
with:
node_image: "kindest/node:${{ matrix.kube-tag }}"
cluster_name: kube-${{ matrix.kube-tag }}
Expand All @@ -74,12 +72,12 @@ jobs:
version: v2.17.0

- name: Create k8s KinD Cluster
uses: helm/kind-action@v1.2.0
uses: helm/kind-action@v1.4.0
with:
node_image: "kindest/node:v1.18.2"
cluster_name: kube-v1.18.2-helm2

- name: Initialise Helm
- name: Initialize Helm
run: |
# Service account with cluster-admin role for Helm
echo "
Expand All @@ -103,7 +101,7 @@ jobs:
namespace: kube-system
" | kubectl create -f -
# Initialise
# Initialize
helm init --stable-repo-url https://charts.helm.sh/stable --service-account tiller --wait
- name: Run integration tests
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## Unreleased

### Changed

- Updated notices to use Conjur CLI v8.0.
[cyberark/conjur-oss-helm-chart#179](https://github.com/cyberark/conjur-oss-helm-chart/pull/179)

## [2.0.5] - 2022-08-17

### Added
Expand Down
10 changes: 5 additions & 5 deletions ci/secrets.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GCLOUD_CLUSTER_NAME: !var ci/google-container-engine-testbed/gcloud-cluster-name
GCLOUD_PROJECT_NAME: !var ci/google-container-engine-testbed/gcloud-project-name
GCLOUD_SERVICE_KEY: !var:file ci/google-container-engine-testbed/gcloud-service-key
GCLOUD_ZONE: !var ci/google-container-engine-testbed/gcloud-zone
GCLOUD_CLUSTER_NAME: !var ci/gke/rapid/cluster-name
GCLOUD_PROJECT_NAME: !var ci/gke/project-name
GCLOUD_SERVICE_KEY: !var:file ci/gke/service-key
GCLOUD_ZONE: !var ci/gke/zone

DOCKER_REGISTRY_URL: us.gcr.io
DOCKER_REGISTRY_PATH: us.gcr.io/conjur-gke-dev
DOCKER_REGISTRY_PATH: us.gcr.io/refreshing-mark-284016
10 changes: 5 additions & 5 deletions conjur-oss/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,22 @@

Start a container with Conjur CLI and authenticate with the new user:

docker run --rm -it --entrypoint bash cyberark/conjur-cli:5
docker run --rm -it --entrypoint bash cyberark/conjur-cli:8
# Or if using MiniKube, use the following command from the host:
# docker run --rm -it --network host --entrypoint bash cyberark/conjur-cli:5
# docker run --rm -it --network host --entrypoint bash cyberark/conjur-cli:8

# Here ENDPOINT is the DNS name https endpoint for your Conjur service.
# NOTE: Ensure that the target endpoint matches at least one of the expected server
# SSL certificate names otherwise SSL verification will fail and you will not
# be able to log in.
# NOTE: Also ensure that the URL does not contain a slash (`/`) at the end of the URL
conjur init -u <ENDPOINT> -a {{ .Values.account.name | quote }}
conjur init -u <ENDPOINT> -a {{ .Values.account.name | quote }} --self-signed

# API key here is the key that creation of the account provided you in step #2
conjur authn login -u admin -p <API_KEY>
conjur login -i admin -p <API_KEY>

# Check that you are identified as the admin user
conjur authn whoami
conjur whoami

4. Next Steps
- Go through the Conjur Tutorials: https://www.conjur.org/tutorials/
Expand Down
10 changes: 5 additions & 5 deletions examples/common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -469,9 +469,9 @@ export CLI_POD="$(kubectl get pods -n conjur-oss -l app=conjur-cli \
-o jsonpath='{.items[0].metadata.name}')"
CONJUR_URL="https://conjur-oss.conjur-oss.svc.cluster.local"
kubectl exec -n conjur-oss $CLI_POD \
-- bash -c "yes yes | conjur init -a $CONJUR_ACCOUNT -u $CONJUR_URL"
kubectl exec -n conjur-oss $CLI_POD -- conjur authn login \
-u admin -p $ADMIN_PASSWORD
-- bash -c "yes yes | conjur init -a $CONJUR_ACCOUNT -u $CONJUR_URL --self-signed"
kubectl exec -n conjur-oss $CLI_POD -- conjur login \
-i admin -p $ADMIN_PASSWORD
```

And then create a `conjur` alias if your shell supports aliases:
Expand All @@ -493,15 +493,15 @@ After that initial setup, Conjur commands can be executed using the `conjur`
command alias, if you've created one:

```sh-session
$ conjur list variables | grep alice
$ conjur list -k variable | grep alice
"myConjurAccount:user:alice",
$
```

Or by using the `CONJUR_CMD` environment variable:

```sh-session
$ $CONJUR_CMD list variables | grep alice
$ $CONJUR_CMD list -k variable | grep alice
"myConjurAccount:user:alice",
$
```
Expand Down

0 comments on commit 72442d3

Please sign in to comment.