Implement again #1283 changes but bumping the major version

This commit is contained in:
Carlos Rodriguez Hernandez
2019-07-17 13:15:48 +00:00
parent 25ddf05cfd
commit 1ce079c789
138 changed files with 729 additions and 266 deletions

View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: tensorflow-resnet
version: 0.1.9
version: 1.0.0
appVersion: 1.14.0
description: Open-source software library serving the ResNet machine learning model.
keywords:

View File

@@ -69,6 +69,8 @@ The following tables lists the configurable parameters of the TensorFlow ResNet
| `server.image.tag` | TensorFlow Serving Image tag | `{TAG_NAME}` |
| `server.image.pullPolicy` | TensorFlow Serving image pull policy | `IfNotPresent` |
| `server.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `nameOverride` | String to partially override tensorflow-resnet.fullname template with a string (will prepend the release name) | `nil` |
| `fullnameOverride` | String to fully override tensorflow-resnet.fullname template with a string | `nil` |
| `replicaCount` | Desired number of pods | `1` |
| `server.port` | Tensorflow server port | `8500` |
| `client.image.registry` | TensorFlow ResNet image registry | `docker.io` |

View File

@@ -7,20 +7,20 @@
{{- if contains "NodePort" .Values.serviceType }}
export APP_HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.spec.ports[0].nodePort}")
export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "tensorflow-resnet.fullname" . }} -o jsonpath="{.spec.ports[0].nodePort}")
{{- else if contains "LoadBalancer" .Values.serviceType }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "tensorflow-resnet.fullname" . }}'
export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.spec.ports[0].port}")
export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "tensorflow-resnet.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "tensorflow-resnet.fullname" . }} -o jsonpath="{.spec.ports[0].port}")
{{- else if contains "ClusterIP" .Values.serviceType }}
export APP_HOST=127.0.0.1
export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.spec.ports[0].port}")
export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "tensorflow-resnet.fullname" . }} -o jsonpath="{.spec.ports[0].port}")
kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "tensorflow-resnet.fullname" . }} $APP_PORT:$APP_PORT &
{{- end }}

View File

@@ -2,7 +2,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "name" -}}
{{- define "tensorflow-resnet.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -10,10 +10,18 @@ Expand the name of the chart.
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "fullname" -}}
{{- define "tensorflow-resnet.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Return the proper tensorflow-resnet server image name

View File

@@ -1,22 +1,22 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ template "fullname" . }}
name: {{ template "tensorflow-resnet.fullname" . }}
labels:
app: {{ template "name" . }}
app: {{ template "tensorflow-resnet.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
selector:
matchLabels:
app: {{ template "name" . }}
app: {{ template "tensorflow-resnet.name" . }}
release: "{{ .Release.Name }}"
replicas: {{ .Values.replicaCount }}
template:
metadata:
labels:
app: {{ template "name" . }}
app: {{ template "tensorflow-resnet.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
{{- if or .Values.podAnnotations .Values.metrics.enabled }}

View File

@@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ template "fullname" . }}
name: {{ template "tensorflow-resnet.fullname" . }}
labels:
app: {{ template "name" . }}
app: {{ template "tensorflow-resnet.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
@@ -13,4 +13,4 @@ spec:
- port: {{ .Values.server.port }}
protocol: TCP
selector:
app: {{ template "name" . }}
app: {{ template "tensorflow-resnet.name" . }}

View File

@@ -50,6 +50,14 @@ client:
# pullSecrets:
# - myRegistryKeySecretName
## String to partially override tensorflow-resnet.fullname template (will maintain the release name)
##
# nameOverride:
## String to fully override tensorflow-resnet.fullname template
##
# fullnameOverride:
## Kubernetes configuration
## For minikube, set this to NodePort, elsewhere use LoadBalancer
##