Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #33 from jfrog/fix-makefile
Browse files Browse the repository at this point in the history
fix makefile, update chart version
  • Loading branch information
rimusz authored Oct 15, 2019
2 parents 6f47c4b + 76b4e5e commit 764ff4a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# You can disable this by setting `STRIP_DEBUG=""`
STRIP_DEBUG ?=-tags 'strip_debug'
# OUT_DIR sets the Path where the kubenab Build Artifact will be puttet
OUT_DIR ?=../../bin
OUT_DIR ?=../../../bin
GIT_HASH=$(shell git rev-parse HEAD)
BUILD_DATE=$(shell date -u '+%Y-%m-%d_%I:%M:%S%p')
APP_VERSION=$(shell git describe --abbrev=0 --tags)
Expand All @@ -22,4 +22,4 @@ build:
git fetch --tags
@echo "++ Building kubenab go binary..."
mkdir -p bin
cd cmd/kubenab && go build $(STRIP_DEBUG) -a --installsuffix cgo --ldflags="-s -X main.AppVersion=$(APP_VERSION) -X main.BuildDate=$(BUILD_DATE) -X main.GitHash=$(GIT_HASH)" -o $(OUT_DIR)kubenab
cd cmd/kubenab && go build $(STRIP_DEBUG) -a --installsuffix cgo --ldflags="-s -X main.AppVersion=$(APP_VERSION) -X main.BuildDate=$(BUILD_DATE) -X main.GitHash=$(GIT_HASH)" -o $(OUT_DIR)/kubenab
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Kubenab is Kubernetes Admission webhook to enforce pulling of docker images from

### Prerequisites

Kubernetes 1.9.0 or above with the `admissionregistration.k8s.io/v1beta1` API enabled. Verify that by the following command:
Kubernetes 1.12.0 or above with the `admissionregistration.k8s.io/v1beta1` API enabled. Verify that by the following command:
```
kubectl api-versions | grep admissionregistration.k8s.io/v1beta1
```
Expand All @@ -24,10 +24,10 @@ In addition, the `MutatingAdmissionWebhook` and `ValidatingAdmissionWebhook` adm

```bash
# Build docker image
docker build -t my-registry/kubenab:0.0.5 .
docker build -t my-registry/kubenab:0.3.3 .

# Push it to Docker Registry
docker push my-registry/kubenab:0.0.5
docker push my-registry/kubenab:0.3.3
```

### Create [Kubernetes Docker registry secret](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/)
Expand Down
4 changes: 2 additions & 2 deletions chart/kubenab/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: kubenab
version: 0.0.7
appVersion: 0.3.2
version: 0.0.8
appVersion: 0.3.3
home: https://github.com/jfrog/kubenab
kubeVersion: ">=1.12.0"
description: Kubenab Helm chart
Expand Down
2 changes: 1 addition & 1 deletion deployment/kubenab-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: kubenab
image: docker.bintray.io/kubexray:0.3.1
image: docker.bintray.io/kubexray:0.3.3
imagePullPolicy: Always
env:
- name: DOCKER_REGISTRY_URL
Expand Down

0 comments on commit 764ff4a

Please sign in to comment.