Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
nkwangleiGIT committed Apr 11, 2024
2 parents 246fe68 + bca8882 commit 43cadf6
Show file tree
Hide file tree
Showing 65 changed files with 1,281 additions and 439 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COPY go.sum go.sum
# cache deps before building and copying source so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer
RUN go env -w GOPROXY=${GOPROXY}
RUN go mod download
RUN go mod download -x

# Copy the go source
COPY main.go main.go
Expand All @@ -19,8 +19,8 @@ COPY pkg/ pkg/
COPY apiserver/ apiserver/

# Build
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o apiserver-bin apiserver/main.go
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -a -o manager main.go
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -o apiserver-bin apiserver/main.go

# Use alpine as minimal base image to package the manager binary
FROM alpine:3.19.1
Expand Down
57 changes: 57 additions & 0 deletions apiserver/docs/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,63 @@ const docTemplate = `{
"host": "{{.Host}}",
"basePath": "{{.BasePath}}",
"paths": {
"/bff/icon": {
"get": {
"description": "Get app image",
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"tags": [
"MinioAPI"
],
"summary": "Get app image",
"parameters": [
{
"type": "string",
"description": "application name",
"name": "application",
"in": "query",
"required": true
},
{
"type": "string",
"description": "namespace of application",
"name": "namespace",
"in": "query",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "object",
"additionalProperties": {
"type": "string"
}
}
},
"500": {
"description": "Internal Server Error",
"schema": {
"type": "object",
"additionalProperties": {
"type": "string"
}
}
}
}
}
},
"/bff/model/files": {
"delete": {
"description": "Delete files",
Expand Down
57 changes: 57 additions & 0 deletions apiserver/docs/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,63 @@
"host": "localhost:8081",
"basePath": "/",
"paths": {
"/bff/icon": {
"get": {
"description": "Get app image",
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"tags": [
"MinioAPI"
],
"summary": "Get app image",
"parameters": [
{
"type": "string",
"description": "application name",
"name": "application",
"in": "query",
"required": true
},
{
"type": "string",
"description": "namespace of application",
"name": "namespace",
"in": "query",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "string"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "object",
"additionalProperties": {
"type": "string"
}
}
},
"500": {
"description": "Internal Server Error",
"schema": {
"type": "object",
"additionalProperties": {
"type": "string"
}
}
}
}
}
},
"/bff/model/files": {
"delete": {
"description": "Delete files",
Expand Down
38 changes: 38 additions & 0 deletions apiserver/docs/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,44 @@ info:
title: ApiServer Swagger API
version: "1.0"
paths:
/bff/icon:
get:
consumes:
- application/json
description: Get app image
parameters:
- description: application name
in: query
name: application
required: true
type: string
- description: namespace of application
in: query
name: namespace
required: true
type: string
produces:
- application/json
responses:
"200":
description: OK
schema:
type: string
"400":
description: Bad Request
schema:
additionalProperties:
type: string
type: object
"500":
description: Internal Server Error
schema:
additionalProperties:
type: string
type: object
summary: Get app image
tags:
- MinioAPI
/bff/model/files:
delete:
consumes:
Expand Down

0 comments on commit 43cadf6

Please sign in to comment.