Skip to content

Commit

Permalink
fix compile openapiv2
Browse files Browse the repository at this point in the history
Signed-off-by: Ziming Zhang <zziming@vmware.com>
  • Loading branch information
bitsf committed Dec 1, 2020
1 parent 972b77c commit cc90ebf
Show file tree
Hide file tree
Showing 8 changed files with 16,459 additions and 3 deletions.
20 changes: 20 additions & 0 deletions charts/harbor-operator/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,26 @@ rules:
- patch
- update
- watch
- apiGroups:
- goharbor.goharbor.io
resources:
- harborclusters
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- goharbor.goharbor.io
resources:
- harborclusters/status
verbs:
- get
- patch
- update
- apiGroups:
- goharbor.io
resources:
Expand Down
78 changes: 76 additions & 2 deletions charts/harbor-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,78 @@
{{- /* Code generated by make. DO NOT EDIT. */ -}}
apiVersion: apps/v1
kind: Deployment
metadata:
labels: {{- include "chart.labels" . | nindent 4 }}
name: '{{ include "chart.fullname" . }}-controller-manager'
namespace: {{ .Release.Namespace | quote }}
spec:
selector:
matchLabels: {{- include "chart.selectorLabels" . | nindent 6 }}
template:
metadata:
annotations: {{- toYaml .Values.podAnnotations | nindent 8 }}
labels: {{- include "chart.selectorLabels" . | nindent 8 }}
spec:
affinity: {{- toYaml .Values.affinity | nindent 8 }}
containers:
- args:
- --enable-leader-election
- --metrics-addr=127.0.0.1:8080
command:
- /manager
env:
- name: CONFIGURATION_FROM
value: 'env:'
- name: CLASSNAME
value: {{ .Values.harborClass | quote }}
- name: LOG_LEVEL
value: {{ .Values.logLevel | quote }}
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: '{{.Values.image.repository}}:{{.Values.image.tag|default .Chart.AppVersion}}'
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
livenessProbe:
httpGet:
path: /healthz
port: ready
name: manager
ports:
- containerPort: 9443
name: webhook-server
protocol: TCP
- containerPort: 8080
name: metrics
protocol: TCP
- containerPort: 5000
name: ready
protocol: TCP
readinessProbe:
httpGet:
path: /readyz
port: ready
resources: {{- toYaml .Values.resources | nindent 10 }}
volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
- mountPath: /etc/harbor-operator
name: configuration-templates
readOnly: true
nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
serviceAccountName: {{ include "chart.serviceAccountName" . | quote }}
terminationGracePeriodSeconds: 10
tolerations: {{- toYaml .Values.tolerations | nindent 8 }}
volumes:
- name: cert
secret:
defaultMode: 420
secretName: '{{ include "chart.fullname" . }}-certificate'
- configMap:
name: '{{ include "chart.fullname" . }}-config-template'
name: configuration-templates
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
{{- end }}
replicas: {{ .Values.replicaCount }}
{{- end }}
2 changes: 1 addition & 1 deletion pkg/cluster/controllers/storage/minio.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const (
ChartMuseumExternalSecretSuffix = "chart-museum-storage"

DefaultCredsSecret = "creds"
DefaultPrefix = "minio-"
DefaultPrefix = "minio-"

DefaultZone = "zone-harbor"
DefaultRegion = "us-east-1"
Expand Down

0 comments on commit cc90ebf

Please sign in to comment.