Merge pull request #810 from konstructio/main

rebase
konstructio · Oct 10, 2024 · edf7c03 · edf7c03
2 parents c2d2279 + 85277a8
commit edf7c03
Show file tree

Hide file tree

Showing 32 changed files with 99 additions and 206 deletions.
diff --git a/akamai-github/templates/mgmt/components/kubefirst/console.yaml b/akamai-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:

diff --git a/akamai-github/templates/mgmt/components/kubefirst/wait.yaml b/akamai-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait

diff --git a/aws-github/templates/mgmt/components/kubefirst/console.yaml b/aws-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,21 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-          serviceAccount:
-            create: true
-            annotations:
-              eks.amazonaws.com/role-arn: arn:aws:iam::<AWS_ACCOUNT_ID>:role/kubefirst-api-<CLUSTER_NAME>
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:

diff --git a/aws-github/templates/mgmt/components/kubefirst/wait.yaml b/aws-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait

diff --git a/aws-gitlab/templates/mgmt/components/kubefirst/console.yaml b/aws-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,21 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-          serviceAccount:
-            create: true
-            annotations:
-              eks.amazonaws.com/role-arn: arn:aws:iam::<AWS_ACCOUNT_ID>:role/kubefirst-api-<CLUSTER_NAME>
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:

diff --git a/aws-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/aws-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait

diff --git a/civo-github/templates/mgmt/components/kubefirst/console.yaml b/civo-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:

diff --git a/civo-github/templates/mgmt/components/kubefirst/wait.yaml b/civo-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait

diff --git a/civo-gitlab/templates/mgmt/components/kubefirst/console.yaml b/civo-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:

diff --git a/civo-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/civo-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait

diff --git a/digitalocean-github/templates/mgmt/components/kubefirst/console.yaml b/digitalocean-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:

diff --git a/digitalocean-github/templates/mgmt/components/kubefirst/wait.yaml b/digitalocean-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait

diff --git a/digitalocean-gitlab/templates/mgmt/components/kubefirst/console.yaml b/digitalocean-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:

diff --git a/digitalocean-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/digitalocean-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait

diff --git a/google-github/templates/mgmt/components/kubefirst/console.yaml b/google-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:

diff --git a/google-github/templates/mgmt/components/kubefirst/wait.yaml b/google-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait

diff --git a/google-gitlab/templates/mgmt/components/kubefirst/console.yaml b/google-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:

diff --git a/google-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/google-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait

diff --git a/k3d-github/cluster-types/mgmt/components/kubefirst/console-arm.yaml b/k3d-github/cluster-types/mgmt/components/kubefirst/console-arm.yaml
@@ -9,7 +9,7 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
+    targetRevision: 2.6.2-rc24
     chart: kubefirst
     helm:
       values: |-