Skip to content

Commit f91bc48

Browse files
committed
Use Conjur CLI v8.0
1 parent 48ab8b1 commit f91bc48

File tree

5 files changed

+32
-27
lines changed

5 files changed

+32
-27
lines changed

.github/workflows/ci.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,19 @@ jobs:
3636
strategy:
3737
matrix:
3838
kube-tag:
39+
- v1.26.0
3940
- v1.21.2
40-
- v1.18.2
41-
- v1.16.9
42-
- v1.14.10
4341
steps:
4442
- name: Check out code
4543
uses: actions/checkout@v2
4644

4745
- name: Install Helm
48-
uses: azure/setup-helm@v1
46+
uses: azure/setup-helm@v3
4947
with:
5048
version: v3.2.1
5149

5250
- name: Create k8s KinD Cluster
53-
uses: helm/kind-action@v1.2.0
51+
uses: helm/kind-action@v1.4.0
5452
with:
5553
node_image: "kindest/node:${{ matrix.kube-tag }}"
5654
cluster_name: kube-${{ matrix.kube-tag }}
@@ -59,7 +57,7 @@ jobs:
5957
run: ./test-minimal.sh
6058

6159
install-test-helm-v2:
62-
name: Install/test Conjur with Helm V2 on KinD Cluster (v1.18.2)
60+
name: Install/test Conjur with Helm V2 on KinD Cluster (v1.21.2)
6361
needs:
6462
- linter
6563
- install-test-helm-v3
@@ -74,12 +72,12 @@ jobs:
7472
version: v2.17.0
7573

7674
- name: Create k8s KinD Cluster
77-
uses: helm/kind-action@v1.2.0
75+
uses: helm/kind-action@v1.4.0
7876
with:
79-
node_image: "kindest/node:v1.18.2"
80-
cluster_name: kube-v1.18.2-helm2
77+
node_image: "kindest/node:v1.21.2"
78+
cluster_name: kube-v1.21.2-helm2
8179

82-
- name: Initialise Helm
80+
- name: Initialize Helm
8381
run: |
8482
# Service account with cluster-admin role for Helm
8583
echo "
@@ -103,7 +101,7 @@ jobs:
103101
namespace: kube-system
104102
" | kubectl create -f -
105103
106-
# Initialise
104+
# Initialize
107105
helm init --stable-repo-url https://charts.helm.sh/stable --service-account tiller --wait
108106
109107
- name: Run integration tests

CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## Unreleased
88

9+
## [2.0.6] - 2023-03-08
10+
11+
### Changed
12+
- Updated notices to use Conjur CLI v8.0.
13+
[cyberark/conjur-oss-helm-chart#179](https://github.com/cyberark/conjur-oss-helm-chart/pull/179)
14+
915
## [2.0.5] - 2022-08-17
1016

1117
### Added
@@ -159,7 +165,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
159165
### Added
160166
- First version of chart available.
161167

162-
[Unreleased]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.5...HEAD
168+
[Unreleased]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.6...HEAD
169+
[2.0.6]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.5...v2.0.6
163170
[2.0.5]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.4...v2.0.5
164171
[2.0.4]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.3...v2.0.4
165172
[2.0.3]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.2...v2.0.3

ci/secrets.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
GCLOUD_CLUSTER_NAME: !var ci/google-container-engine-testbed/gcloud-cluster-name
2-
GCLOUD_PROJECT_NAME: !var ci/google-container-engine-testbed/gcloud-project-name
3-
GCLOUD_SERVICE_KEY: !var:file ci/google-container-engine-testbed/gcloud-service-key
4-
GCLOUD_ZONE: !var ci/google-container-engine-testbed/gcloud-zone
1+
GCLOUD_CLUSTER_NAME: !var ci/gke/rapid/cluster-name
2+
GCLOUD_PROJECT_NAME: !var ci/gke/project-name
3+
GCLOUD_SERVICE_KEY: !var:file ci/gke/service-key
4+
GCLOUD_ZONE: !var ci/gke/zone
55

66
DOCKER_REGISTRY_URL: us.gcr.io
7-
DOCKER_REGISTRY_PATH: us.gcr.io/conjur-gke-dev
7+
DOCKER_REGISTRY_PATH: us.gcr.io/refreshing-mark-284016

conjur-oss/templates/NOTES.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,22 @@
7575

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

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

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

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

9292
# Check that you are identified as the admin user
93-
conjur authn whoami
93+
conjur whoami
9494

9595
4. Next Steps
9696
- Go through the Conjur Tutorials: https://www.conjur.org/tutorials/

examples/common/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,9 @@ export CLI_POD="$(kubectl get pods -n conjur-oss -l app=conjur-cli \
469469
-o jsonpath='{.items[0].metadata.name}')"
470470
CONJUR_URL="https://conjur-oss.conjur-oss.svc.cluster.local"
471471
kubectl exec -n conjur-oss $CLI_POD \
472-
-- bash -c "yes yes | conjur init -a $CONJUR_ACCOUNT -u $CONJUR_URL"
473-
kubectl exec -n conjur-oss $CLI_POD -- conjur authn login \
474-
-u admin -p $ADMIN_PASSWORD
472+
-- bash -c "yes yes | conjur init -a $CONJUR_ACCOUNT -u $CONJUR_URL --self-signed"
473+
kubectl exec -n conjur-oss $CLI_POD -- conjur login \
474+
-i admin -p $ADMIN_PASSWORD
475475
```
476476

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

495495
```sh-session
496-
$ conjur list variables | grep alice
496+
$ conjur list -k variable | grep alice
497497
"myConjurAccount:user:alice",
498498
$
499499
```
500500

501501
Or by using the `CONJUR_CMD` environment variable:
502502

503503
```sh-session
504-
$ $CONJUR_CMD list variables | grep alice
504+
$ $CONJUR_CMD list -k variable | grep alice
505505
"myConjurAccount:user:alice",
506506
$
507507
```

0 commit comments

Comments
 (0)