Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support console separate deploy #62

Merged
merged 1 commit into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion crds/ApisixClusterConfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

{{- if .Values.Component.region_all.enable }}
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -97,3 +97,4 @@ spec:
- type
- status
- lastTransitionTime
{{- end }}
3 changes: 2 additions & 1 deletion crds/ApisixConsumer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

{{- if .Values.Component.region_all.enable }}
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -250,3 +250,4 @@ spec:
- type
- status
- lastTransitionTime
{{- end }}
3 changes: 2 additions & 1 deletion crds/ApisixGlobalRule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

{{- if .Values.Component.region_all.enable }}
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -86,3 +86,4 @@ spec:
type: string
observedGeneration:
type: integer
{{- end }}
3 changes: 2 additions & 1 deletion crds/ApisixPluginConfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

{{- if .Values.Component.region_all.enable }}
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -86,3 +86,4 @@ spec:
type: string
observedGeneration:
type: integer
{{- end }}
3 changes: 2 additions & 1 deletion crds/ApisixRoute.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

{{- if .Values.Component.region_all.enable }}
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -361,3 +361,4 @@ spec:
type: string
observedGeneration:
type: integer
{{- end }}
3 changes: 2 additions & 1 deletion crds/ApisixTls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

{{- if .Values.Component.region_all.enable }}
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -194,3 +194,4 @@ spec:
type: string
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
{{- end }}
3 changes: 2 additions & 1 deletion crds/ApisixUpstream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

{{- if .Values.Component.region_all.enable }}
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -460,3 +460,4 @@ spec:
type: string
observedGeneration:
type: integer
{{- end }}
3 changes: 2 additions & 1 deletion crds/monitoring.coreos.com_servicemonitors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -479,3 +479,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_componentdefinitions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -215,3 +215,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_helmapps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -164,3 +164,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_rainbondclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -481,3 +481,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_rainbondpackages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -125,3 +125,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_rainbondvolumes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -169,3 +169,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_rbdabilities.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -77,3 +77,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_rbdcomponents.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -1744,3 +1744,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_rbdplugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -80,3 +80,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_servicemeshclasses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -93,3 +93,4 @@ spec:
storage: true
subresources:
status: {}
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_servicemeshes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -61,3 +61,4 @@ spec:
storage: true
subresources:
status: {}
{{- end }}
3 changes: 2 additions & 1 deletion crds/rainbond.io_thirdcomponents.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the terms and conditions of version 3 of the GNU General Public License.
#
#############################################

{{- if .Values.Component.region_all.enable }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -246,3 +246,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
18 changes: 18 additions & 0 deletions templates/appstore-admin-ui-svc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{{- if .Values.Component.rbd_app_ui.enable }}
apiVersion: v1
kind: Service
metadata:
labels:
name: appstore-admin-ui
name: appstore-admin-ui
namespace: {{ .Release.Namespace }}
spec:
ports:
- name: appstore-admin-ui
port: 80
protocol: TCP
targetPort: 80
selector:
name: appstore-admin-ui
type: ClusterIP
{{- end }}
39 changes: 39 additions & 0 deletions templates/appstore-admin-ui.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{{- if .Values.Component.rbd_app_ui.enable }}
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
name: appstore-admin-ui
name: appstore-admin-ui
namespace: {{ .Release.Namespace }}
spec:
replicas: 1
revisionHistoryLimit: 10
selector:
matchLabels:
name: appstore-admin-ui
strategy:
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
type: RollingUpdate
template:
metadata:
labels:
name: appstore-admin-ui
name: appstore-admin-ui
namespace: {{ .Release.Namespace }}
spec:
containers:
- image: {{ .Values.Cluster.rainbondImageRepository }}/appstore-admin-ui:{{ .Values.Cluster.installVersion }}
imagePullPolicy: IfNotPresent
name: appstore-admin-ui
resources: {}
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
securityContext: {}
terminationGracePeriodSeconds: 30
{{- end }}
18 changes: 18 additions & 0 deletions templates/appstore-console-svc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{{- if .Values.Component.rbd_app_ui.enable }}
apiVersion: v1
kind: Service
metadata:
labels:
name: appstore-console
name: appstore-console
namespace: {{ .Release.Namespace }}
spec:
ports:
- name: http
port: 7070
protocol: TCP
targetPort: 7070
selector:
name: appstore-console
type: ClusterIP
{{- end }}
Loading
Loading