diff --git a/Gemfile b/Gemfile index a180e26e478..728eff6814a 100644 --- a/Gemfile +++ b/Gemfile @@ -632,7 +632,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gitaly', '~> 17.5.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.5.0', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 17.6.1', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 diff --git a/Gemfile.checksum b/Gemfile.checksum index cace381ae35..f1f9b2b1841 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -231,7 +231,7 @@ {"name":"gitlab-glfm-markdown","version":"0.0.23","platform":"ruby","checksum":"89a12909c39aea326adb0b7194f7b89d61b4f9122308435fba0bcb84e4f4ff24"}, {"name":"gitlab-glfm-markdown","version":"0.0.23","platform":"x86_64-darwin","checksum":"4b77a37358d98c3b2269f7dd19f6549555c5de00bf12a4eca25c34076f72f78d"}, {"name":"gitlab-glfm-markdown","version":"0.0.23","platform":"x86_64-linux","checksum":"2b71ec5ae06a524114e2cf423ce6635fd1f5c6776c0c956188aa0b2f0fbfbead"}, -{"name":"gitlab-kas-grpc","version":"17.5.1","platform":"ruby","checksum":"88639bfaa9301d78a7fbff696ec262ed696a15a6f41c1b51bffe6b39c7a61ca7"}, +{"name":"gitlab-kas-grpc","version":"17.6.1","platform":"ruby","checksum":"5ab204e9f44a3309dfb3c77b7731bd52067cefe005867699f44e5a14580c08c3"}, {"name":"gitlab-labkit","version":"0.37.0","platform":"ruby","checksum":"d2dd0a60db2149a9a8eebf2975dc23f54ac3ceb01bdba732eb1b26b86dfffa70"}, {"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"}, {"name":"gitlab-mail_room","version":"0.0.25","platform":"ruby","checksum":"223ce7c3c0797b6015eaa37147884e6ddc7be9a7ee90a424358c96bc18613b1a"}, @@ -293,7 +293,7 @@ {"name":"grape_logging","version":"1.8.4","platform":"ruby","checksum":"efcc3e322dbd5d620a68f078733b7db043cf12680144cd03c982f14115c792d1"}, {"name":"graphlient","version":"0.8.0","platform":"ruby","checksum":"98c408da1d083454e9f5e274f3b0b6261e2a0c2b5f2ed7b3ef9441d46f8e7cb1"}, {"name":"graphlyte","version":"1.0.0","platform":"ruby","checksum":"b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d"}, -{"name":"graphql","version":"2.4.4","platform":"ruby","checksum":"62ff8392ee0187b1995ab67b718d7e3ecf73c900488b3fcee43f41726dae5145"}, +{"name":"graphql","version":"2.4.6","platform":"ruby","checksum":"5e3dae289de8c2483bc1c6a79e1ecbfbbf9127baacb7a89ee4ed3eb7ed751411"}, {"name":"graphql-client","version":"0.23.0","platform":"ruby","checksum":"f238b8e451676baad06bd15f95396e018192243dcf12c4e6d13fb41d9a2babc1"}, {"name":"graphql-docs","version":"5.0.0","platform":"ruby","checksum":"76baca6e5a803a4b6a9fbbbfdbf16742b7c4c546c8592b6e1a7aa4e79e562d04"}, {"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"}, diff --git a/Gemfile.lock b/Gemfile.lock index 171fce2e0a5..1acd6304219 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -747,7 +747,7 @@ GEM nokogiri (~> 1, >= 1.10.8) gitlab-glfm-markdown (0.0.23) rb_sys (= 0.9.94) - gitlab-kas-grpc (17.5.1) + gitlab-kas-grpc (17.6.1) grpc (~> 1.0) gitlab-labkit (0.37.0) actionpack (>= 5.0.0, < 8.1.0) @@ -927,7 +927,7 @@ GEM faraday (~> 2.0) graphql-client graphlyte (1.0.0) - graphql (2.4.4) + graphql (2.4.6) base64 fiber-storage graphql-client (0.23.0) @@ -2076,7 +2076,7 @@ DEPENDENCIES gitlab-glfm-markdown (~> 0.0.21) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 17.5.0) + gitlab-kas-grpc (~> 17.6.1) gitlab-labkit (~> 0.37.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index 5080cb21669..447031bce2d 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -232,7 +232,7 @@ {"name":"gitlab-glfm-markdown","version":"0.0.23","platform":"ruby","checksum":"89a12909c39aea326adb0b7194f7b89d61b4f9122308435fba0bcb84e4f4ff24"}, {"name":"gitlab-glfm-markdown","version":"0.0.23","platform":"x86_64-darwin","checksum":"4b77a37358d98c3b2269f7dd19f6549555c5de00bf12a4eca25c34076f72f78d"}, {"name":"gitlab-glfm-markdown","version":"0.0.23","platform":"x86_64-linux","checksum":"2b71ec5ae06a524114e2cf423ce6635fd1f5c6776c0c956188aa0b2f0fbfbead"}, -{"name":"gitlab-kas-grpc","version":"17.5.1","platform":"ruby","checksum":"88639bfaa9301d78a7fbff696ec262ed696a15a6f41c1b51bffe6b39c7a61ca7"}, +{"name":"gitlab-kas-grpc","version":"17.6.1","platform":"ruby","checksum":"5ab204e9f44a3309dfb3c77b7731bd52067cefe005867699f44e5a14580c08c3"}, {"name":"gitlab-labkit","version":"0.37.0","platform":"ruby","checksum":"d2dd0a60db2149a9a8eebf2975dc23f54ac3ceb01bdba732eb1b26b86dfffa70"}, {"name":"gitlab-license","version":"2.6.0","platform":"ruby","checksum":"2c1f8ae73835640ec77bf758c1d0c9730635043c01cf77902f7976e826d7d016"}, {"name":"gitlab-mail_room","version":"0.0.25","platform":"ruby","checksum":"223ce7c3c0797b6015eaa37147884e6ddc7be9a7ee90a424358c96bc18613b1a"}, @@ -294,7 +294,7 @@ {"name":"grape_logging","version":"1.8.4","platform":"ruby","checksum":"efcc3e322dbd5d620a68f078733b7db043cf12680144cd03c982f14115c792d1"}, {"name":"graphlient","version":"0.8.0","platform":"ruby","checksum":"98c408da1d083454e9f5e274f3b0b6261e2a0c2b5f2ed7b3ef9441d46f8e7cb1"}, {"name":"graphlyte","version":"1.0.0","platform":"ruby","checksum":"b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d"}, -{"name":"graphql","version":"2.4.4","platform":"ruby","checksum":"62ff8392ee0187b1995ab67b718d7e3ecf73c900488b3fcee43f41726dae5145"}, +{"name":"graphql","version":"2.4.6","platform":"ruby","checksum":"5e3dae289de8c2483bc1c6a79e1ecbfbbf9127baacb7a89ee4ed3eb7ed751411"}, {"name":"graphql-client","version":"0.23.0","platform":"ruby","checksum":"f238b8e451676baad06bd15f95396e018192243dcf12c4e6d13fb41d9a2babc1"}, {"name":"graphql-docs","version":"5.0.0","platform":"ruby","checksum":"76baca6e5a803a4b6a9fbbbfdbf16742b7c4c546c8592b6e1a7aa4e79e562d04"}, {"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 97dc89d2f91..8510fb956b0 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -757,7 +757,7 @@ GEM nokogiri (~> 1, >= 1.10.8) gitlab-glfm-markdown (0.0.23) rb_sys (= 0.9.94) - gitlab-kas-grpc (17.5.1) + gitlab-kas-grpc (17.6.1) grpc (~> 1.0) gitlab-labkit (0.37.0) actionpack (>= 5.0.0, < 8.1.0) @@ -937,7 +937,7 @@ GEM faraday (~> 2.0) graphql-client graphlyte (1.0.0) - graphql (2.4.4) + graphql (2.4.6) base64 fiber-storage graphql-client (0.23.0) @@ -2104,7 +2104,7 @@ DEPENDENCIES gitlab-glfm-markdown (~> 0.0.21) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 17.5.0) + gitlab-kas-grpc (~> 17.6.1) gitlab-labkit (~> 0.37.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) diff --git a/app/assets/javascripts/content_editor/components/content_editor.vue b/app/assets/javascripts/content_editor/components/content_editor.vue index aaaaf216967..2ac1c1c6c8e 100644 --- a/app/assets/javascripts/content_editor/components/content_editor.vue +++ b/app/assets/javascripts/content_editor/components/content_editor.vue @@ -282,7 +282,7 @@ export default {
diff --git a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue index a6b69652150..9f8d0532104 100644 --- a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue +++ b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_overview.vue @@ -200,16 +200,16 @@ export default { ], }; }, - showFluxResourceDetails() { + showFluxResourceDetails(section) { const fluxResource = !isEmpty(this.fluxKustomization) ? this.fluxKustomization : this.fluxHelmRelease; const fluxResourceTransformed = this.transformFluxResourceData(fluxResource); - this.toggleDetailsDrawer(fluxResourceTransformed); + this.toggleDetailsDrawer(fluxResourceTransformed, section); }, - toggleDetailsDrawer(item) { - this.$refs.detailsDrawer?.toggle(item); + toggleDetailsDrawer(item, section) { + this.$refs.detailsDrawer?.toggle(item, section); }, closeDetailsDrawer() { this.$refs.detailsDrawer?.close(); diff --git a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_status_bar.vue b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_status_bar.vue index 73af9a4c002..ae67166a6f2 100644 --- a/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_status_bar.vue +++ b/app/assets/javascripts/environments/environment_details/components/kubernetes/kubernetes_status_bar.vue @@ -1,5 +1,13 @@ ['name', 'kind', 'labels', 'annotations'].every((key) => item[key]), }, + selectedSection: { + type: String, + required: false, + default: '', + }, }, data() { return { eventsError: null, eventsLoading: false, k8sEvents: [] }; @@ -100,6 +109,11 @@ export default { hasActions() { return Boolean(this.item.actions?.length); }, + expanded() { + return { + status: this.selectedSection === SECTIONS.STATUS, + }; + }, }, methods: { getLabelBadgeText([key, value]) { @@ -170,7 +184,12 @@ export default { $options.STATUS_LABELS[item.status] }} - +