Skip to content

Commit

Permalink
Merge pull request #11 from bancolombia/release/7.3.3
Browse files Browse the repository at this point in the history
Release/7.3.3
  • Loading branch information
JhoanAlvear authored Apr 26, 2024
2 parents 97a2cf3 + 6ca715e commit 6b6956f
Show file tree
Hide file tree
Showing 10 changed files with 167 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
with:
version: v3.12.1
- uses: helm/[email protected]
- uses: helm/kind-action@v1.9.0
- uses: helm/kind-action@v1.10.0
with:
node_image: kindest/node:v1.29.0
- run: ct install --target-branch ${{ github.event.repository.default_branch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- if: steps.list-changed.outputs.changed == 'true'
run: ct lint --config=.ct.yml --target-branch ${{ github.event.repository.default_branch }}
- if: steps.list-changed.outputs.changed == 'true'
uses: helm/kind-action@v1.9.0
uses: helm/kind-action@v1.10.0
with:
node_image: kindest/node:v1.29.0
- if: steps.list-changed.outputs.changed == 'true'
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/update-pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Actualización del repo oficial sobre la customización
on:
pull_request:
branches:
- 'release/*'
env:
kube-dash: https://github.com/kubernetes/dashboard

jobs:
actualizar-sobre-ultimo-repo:
name: update
runs-on: ubuntu-latest
steps:
- name: Clonar última versión repo banco
uses: actions/checkout@v4
with:
repository: bancolombia/kubernetes-dashboard
ref: ${GITHUB_REF}
- name: Actualizar rama respecto a repo oficial
run: |
git remote add kube-dash ${env.kube-dash}
git pull kube-dash ${GITHUB_REF}
git push origin ${GITHUB_REF}


2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Welcome to Kubernetes. We are excited about the prospect of you joining our [com

_As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities._

## Getting Started
## Getting Started EKS

To learn more about the project, please read through the following documents:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Coverage Status](https://codecov.io/github/kubernetes/dashboard/coverage.svg?branch=master)](https://codecov.io/github/kubernetes/dashboard?branch=master)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/kubernetes/dashboard/blob/master/LICENSE)

## Introduction p
## Introduction

Kubernetes Dashboard is a general purpose, web-based UI for Kubernetes clusters. It allows users to manage applications running in the cluster and troubleshoot them, as well as manage the cluster itself.

Expand Down
3 changes: 3 additions & 0 deletions modules/api/pkg/handler/apihandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,7 @@ func CreateHTTPAPIHandler(iManager integration.Manager) (*restful.Container, err
Param(apiV1Ws.PathParameter("kind", "kind of the resource")).
Param(apiV1Ws.PathParameter("namespace", "namespace of the resource")).
Param(apiV1Ws.PathParameter("name", "name of the resource")).
Param(apiV1Ws.QueryParameter("deleteNow", "override graceful delete options and enforce immediate deletion")).
Returns(http.StatusNoContent, "", nil))
apiV1Ws.Route(
apiV1Ws.GET("/_raw/{kind}/namespace/{namespace}/name/{name}").To(apiHandler.handleGetResource).
Expand Down Expand Up @@ -937,6 +938,7 @@ func CreateHTTPAPIHandler(iManager integration.Manager) (*restful.Container, err
Param(apiV1Ws.PathParameter("kind", "kind of the resource")).
Param(apiV1Ws.PathParameter("namespace", "namespace of the resource")).
Param(apiV1Ws.PathParameter("name", "name of the resource")).
Param(apiV1Ws.QueryParameter("scaleBy", "desired number of replicas")).
Writes(scaling.ReplicaCounts{}).
Returns(http.StatusOK, "OK", scaling.ReplicaCounts{}))
apiV1Ws.Route(
Expand All @@ -945,6 +947,7 @@ func CreateHTTPAPIHandler(iManager integration.Manager) (*restful.Container, err
Doc("scales a non-namespaced resource").
Param(apiV1Ws.PathParameter("kind", "kind of the resource")).
Param(apiV1Ws.PathParameter("name", "name of the resource")).
Param(apiV1Ws.QueryParameter("scaleBy", "desired number of replicas")).
Writes(scaling.ReplicaCounts{}).
Returns(http.StatusOK, "OK", scaling.ReplicaCounts{}))
apiV1Ws.Route(
Expand Down
70 changes: 44 additions & 26 deletions modules/api/schema/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,12 @@
"name": "name",
"in": "path",
"required": true
},
{
"type": "string",
"description": "override graceful delete options and enforce immediate deletion",
"name": "deleteNow",
"in": "query"
}
],
"responses": {
Expand Down Expand Up @@ -7652,6 +7658,12 @@
"name": "name",
"in": "path",
"required": true
},
{
"type": "string",
"description": "desired number of replicas",
"name": "scaleBy",
"in": "query"
}
],
"responses": {
Expand Down Expand Up @@ -7794,6 +7806,12 @@
"name": "name",
"in": "path",
"required": true
},
{
"type": "string",
"description": "desired number of replicas",
"name": "scaleBy",
"in": "query"
}
],
"responses": {
Expand Down Expand Up @@ -10034,13 +10052,13 @@
},
"cronjob.CronJobDetail": {
"required": [
"objectMeta",
"typeMeta",
"schedule",
"suspend",
"active",
"lastSchedule",
"containerImages",
"objectMeta",
"typeMeta",
"schedule",
"concurrencyPolicy",
"startingDeadlineSeconds",
"errors"
Expand Down Expand Up @@ -10158,11 +10176,11 @@
},
"daemonset.DaemonSetDetail": {
"required": [
"typeMeta",
"podInfo",
"containerImages",
"initContainerImages",
"objectMeta",
"typeMeta",
"podInfo",
"errors"
],
"properties": {
Expand Down Expand Up @@ -10383,11 +10401,11 @@
},
"deployment.DeploymentDetail": {
"required": [
"initContainerImages",
"objectMeta",
"typeMeta",
"pods",
"containerImages",
"initContainerImages",
"selector",
"statusInfo",
"conditions",
Expand Down Expand Up @@ -10702,13 +10720,13 @@
},
"horizontalpodautoscaler.HorizontalPodAutoscalerDetail": {
"required": [
"typeMeta",
"scaleTargetRef",
"minReplicas",
"maxReplicas",
"currentCPUUtilizationPercentage",
"targetCPUUtilizationPercentage",
"objectMeta",
"typeMeta",
"scaleTargetRef",
"minReplicas",
"currentReplicas",
"desiredReplicas",
"lastScaleTime"
Expand Down Expand Up @@ -10985,13 +11003,13 @@
},
"job.JobDetail": {
"required": [
"parallelism",
"jobStatus",
"objectMeta",
"typeMeta",
"podInfo",
"containerImages",
"initContainerImages",
"parallelism",
"jobStatus",
"completions",
"errors"
],
Expand Down Expand Up @@ -11485,10 +11503,10 @@
},
"node.NodeDetail": {
"required": [
"objectMeta",
"typeMeta",
"ready",
"allocatedResources",
"objectMeta",
"phase",
"podCIDR",
"providerID",
Expand Down Expand Up @@ -11661,16 +11679,16 @@
},
"persistentvolume.PersistentVolumeDetail": {
"required": [
"objectMeta",
"reclaimPolicy",
"reason",
"status",
"mountOptions",
"claim",
"objectMeta",
"typeMeta",
"reclaimPolicy",
"storageClass",
"capacity",
"accessModes",
"storageClass",
"mountOptions",
"status",
"reason",
"message",
"persistentVolumeSource"
],
Expand Down Expand Up @@ -11788,13 +11806,13 @@
},
"persistentvolumeclaim.PersistentVolumeClaimDetail": {
"required": [
"objectMeta",
"typeMeta",
"status",
"volume",
"capacity",
"accessModes",
"storageClass"
"storageClass",
"objectMeta"
],
"properties": {
"accessModes": {
Expand Down Expand Up @@ -12227,11 +12245,11 @@
},
"replicaset.ReplicaSetDetail": {
"required": [
"initContainerImages",
"objectMeta",
"typeMeta",
"podInfo",
"containerImages",
"initContainerImages",
"selector",
"horizontalPodAutoscalerList",
"errors"
Expand Down Expand Up @@ -12341,11 +12359,11 @@
},
"replicationcontroller.ReplicationControllerDetail": {
"required": [
"initContainerImages",
"objectMeta",
"typeMeta",
"podInfo",
"containerImages",
"initContainerImages",
"labelSelector",
"errors"
],
Expand Down Expand Up @@ -12721,9 +12739,9 @@
},
"secret.SecretDetail": {
"required": [
"type",
"objectMeta",
"typeMeta",
"type",
"data"
],
"properties": {
Expand Down Expand Up @@ -12810,13 +12828,13 @@
},
"service.ServiceDetail": {
"required": [
"selector",
"type",
"clusterIP",
"objectMeta",
"typeMeta",
"internalEndpoint",
"externalEndpoints",
"selector",
"type",
"endpointList",
"sessionAffinity",
"errors"
Expand Down Expand Up @@ -12980,11 +12998,11 @@
},
"statefulset.StatefulSetDetail": {
"required": [
"objectMeta",
"typeMeta",
"podInfo",
"containerImages",
"initContainerImages",
"objectMeta",
"errors"
],
"properties": {
Expand Down
10 changes: 5 additions & 5 deletions modules/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@angular/platform-browser-dynamic": "16.2.1",
"@angular/router": "16.2.1",
"@swimlane/ngx-charts": "20.5.0",
"ace-builds": "1.33.0",
"ace-builds": "1.33.1",
"core-js": "3.36.1",
"crop-url": "4.0.1",
"d3-shape": "3.2.0",
Expand Down Expand Up @@ -106,11 +106,11 @@
"@types/js-yaml": "4.0.9",
"@types/lodash-es": "4.17.12",
"@types/node": "20.12.7",
"@typescript-eslint/eslint-plugin": "7.6.0",
"@typescript-eslint/parser": "7.6.0",
"@typescript-eslint/eslint-plugin": "7.7.1",
"@typescript-eslint/parser": "7.7.1",
"codelyzer": "6.0.2",
"concurrently": "8.2.2",
"cypress": "13.7.3",
"cypress": "13.8.1",
"cypress-fail-fast": "7.1.0",
"del": "7.1.0",
"eslint": "8.57.0",
Expand Down Expand Up @@ -140,7 +140,7 @@
"sass-loader": "14.2.0",
"semver": "7.6.0",
"source-map-explorer": "2.5.3",
"stylelint": "16.3.1",
"stylelint": "16.4.0",
"stylelint-config-standard-scss": "13.1.0",
"stylelint-no-unsupported-browser-features": "8.0.1",
"stylelint-order": "6.0.4",
Expand Down
8 changes: 6 additions & 2 deletions modules/web/schema/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -5307,7 +5307,9 @@ type Mutation {
aggregations: String
"""namespace of the resource"""
namespace: String!
): Void @httpOperation(subgraph: "api", path: "/api/v1/_raw/{args.kind}/name/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: DELETE, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}") @httpOperation(subgraph: "api", path: "/api/v1/_raw/{args.kind}/namespace/{args.namespace}/name/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: DELETE, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}")
"""override graceful delete options and enforce immediate deletion"""
deleteNow: String
): Void @httpOperation(subgraph: "api", path: "/api/v1/_raw/{args.kind}/name/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: DELETE, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}") @httpOperation(subgraph: "api", path: "/api/v1/_raw/{args.kind}/namespace/{args.namespace}/name/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: DELETE, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\",\"deleteNow\":\"deleteNow\"}")
"""creates an application based on provided deployment.AppDeploymentSpec"""
handleDeploy(
"""
Expand Down Expand Up @@ -5566,7 +5568,9 @@ type Mutation {
metricNames: String
"""Aggregations to be performed for each metric (default: sum)"""
aggregations: String
): scaling_ReplicaCounts @httpOperation(subgraph: "api", path: "/api/v1/scale/{args.kind}/{args.namespace}/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: PUT, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}") @httpOperation(subgraph: "api", path: "/api/v1/scale/{args.kind}/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: PUT, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\"}")
"""desired number of replicas"""
scaleBy: String
): scaling_ReplicaCounts @httpOperation(subgraph: "api", path: "/api/v1/scale/{args.kind}/{args.namespace}/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: PUT, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\",\"scaleBy\":\"scaleBy\"}") @httpOperation(subgraph: "api", path: "/api/v1/scale/{args.kind}/{args.name}", operationSpecificHeaders: "{\"Content-Type\":\"application/json\",\"Accept\":\"application/json\"}", httpMethod: PUT, queryParamArgMap: "{\"filterBy\":\"filterBy\",\"sortBy\":\"sortBy\",\"itemsPerPage\":\"itemsPerPage\",\"page\":\"page\",\"metricNames\":\"metricNames\",\"aggregations\":\"aggregations\",\"scaleBy\":\"scaleBy\"}")
"""stores ImagePullSecret in a Kubernetes Secret"""
handleCreateImagePullSecret(
"""
Expand Down
Loading

0 comments on commit 6b6956f

Please sign in to comment.