#76 #68, #53

Merged
yangxzh1 merged 4 commits from openioctopus/octopus:master into master 2 years ago
  1. +45
    -32
      deploy/charts/octopus/values.yaml
  2. BIN
      server/common/third_party/google/bin/protoc
  3. +1
    -0
      server/openai-server/internal/service/image.go

+ 45
- 32
deploy/charts/octopus/values.yaml View File

@@ -209,16 +209,20 @@ minio:
port: "9000" port: "9000"
affinity: affinity:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/arch - key: kubernetes.io/arch
operator: In operator: In
values:
- amd64
- x64
- x86-64
- x86_64
values: ["amd64", "x64", "x86-64", "x86_64"]
- weight: 100
preference:
matchExpressions:
- key: beta.kubernetes.io/arch
operator: In
values: ["amd64", "x64", "x86-64", "x86_64"]



# mysql # mysql
mysql: mysql:
@@ -244,16 +248,19 @@ mysql:
name: mysql-initdb-config name: mysql-initdb-config
affinity: affinity:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/arch - key: kubernetes.io/arch
operator: In operator: In
values:
- amd64
- x64
- x86-64
- x86_64
values: ["amd64", "x64", "x86-64", "x86_64"]
- weight: 100
preference:
matchExpressions:
- key: beta.kubernetes.io/arch
operator: In
values: ["amd64", "x64", "x86-64", "x86_64"]




# redis # redis
@@ -267,16 +274,19 @@ redis:
existingClaim: "octopus-redis-pvc" existingClaim: "octopus-redis-pvc"
affinity: affinity:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/arch - key: kubernetes.io/arch
operator: In operator: In
values:
- amd64
- x64
- x86-64
- x86_64
values: ["amd64", "x64", "x86-64", "x86_64"]
- weight: 100
preference:
matchExpressions:
- key: beta.kubernetes.io/arch
operator: In
values: ["amd64", "x64", "x86-64", "x86_64"]
replica: replica:
replicaCount: 1 replicaCount: 1
auth: auth:
@@ -293,16 +303,19 @@ nginx-ingress-controller:
nginx-ingress: "yes" nginx-ingress: "yes"
affinity: affinity:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
preference:
matchExpressions:
- key: kubernetes.io/arch - key: kubernetes.io/arch
operator: In operator: In
values:
- amd64
- x64
- x86-64
- x86_64
values: ["amd64", "x64", "x86-64", "x86_64"]
- weight: 100
preference:
matchExpressions:
- key: beta.kubernetes.io/arch
operator: In
values: ["amd64", "x64", "x86-64", "x86_64"]


# grafana # grafana
grafana: grafana:


BIN
server/common/third_party/google/bin/protoc View File


+ 1
- 0
server/openai-server/internal/service/image.go View File

@@ -36,6 +36,7 @@ func (s *ImageService) ListPreImage(ctx context.Context, req *pb.ListPreImageReq
SortBy: req.SortBy, SortBy: req.SortBy,
OrderBy: req.OrderBy, OrderBy: req.OrderBy,
ImageNameLike: req.ImageNameLike, ImageNameLike: req.ImageNameLike,
NameVerLike: req.NameVerLike,
ImageType: innterapi.ImageType(req.ImageType), ImageType: innterapi.ImageType(req.ImageType),
SourceType: innterapi.ImageSourceType(req.SourceType), SourceType: innterapi.ImageSourceType(req.SourceType),
ImageStatus: innterapi.ImageStatus(req.ImageStatus), ImageStatus: innterapi.ImageStatus(req.ImageStatus),


Loading…
Cancel
Save