From 380a116fa8ec4b4e0db060e3632c7e68ef9f77ea Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 21 Feb 2024 15:43:42 +0100 Subject: [PATCH] fix(all): use app.kubernetes.io/name label instead of io.kompose.service --- components/hydra-ldap/resources/service.yaml | 2 +- .../hydra-oidc/resources/hydra-oidc-deployment.yaml | 6 +++--- .../hydra-oidc/resources/hydra-oidc-service.yaml | 4 ++-- .../hydra-saml/resources/hydra-saml-remote-user.yaml | 10 +++++----- .../hydra-saml/resources/hydra-saml-shibboleth-sp.yaml | 10 +++++----- .../hydra-sql/resources/hydra-sql-deployment.yaml | 6 +++--- components/hydra-sql/resources/hydra-sql-service.yaml | 4 ++-- .../authenticated-app/resources/port-forwarder.yaml | 10 +++++----- examples/authenticated-app/resources/saml-idp.yaml | 10 +++++----- .../resources/hydra-dispatcher-deployment.yaml | 6 +++--- .../resources/hydra-dispatcher-service.yaml | 4 ++-- resources/hydra/resources/hydra-deployment.yaml | 6 +++--- resources/hydra/resources/hydra-service.yaml | 4 ++-- 13 files changed, 41 insertions(+), 41 deletions(-) diff --git a/components/hydra-ldap/resources/service.yaml b/components/hydra-ldap/resources/service.yaml index 4adbddb..29db7ec 100644 --- a/components/hydra-ldap/resources/service.yaml +++ b/components/hydra-ldap/resources/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: labels: - io.kompose.service: hydra-ldap + app.kubernetes.io/name: hydra-ldap name: hydra-ldap spec: type: ClusterIP diff --git a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml index 64892bb..9d26fa2 100644 --- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml +++ b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml @@ -2,19 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - io.kompose.service: hydra-oidc + app.kubernetes.io/name: hydra-oidc name: hydra-oidc spec: replicas: 1 selector: matchLabels: - io.kompose.service: hydra-oidc + app.kubernetes.io/name: hydra-oidc strategy: type: Recreate template: metadata: labels: - io.kompose.service: hydra-oidc + app.kubernetes.io/name: hydra-oidc spec: containers: - name: hydra-oidc-php-fpm diff --git a/components/hydra-oidc/resources/hydra-oidc-service.yaml b/components/hydra-oidc/resources/hydra-oidc-service.yaml index 07aab4e..5a94e1d 100644 --- a/components/hydra-oidc/resources/hydra-oidc-service.yaml +++ b/components/hydra-oidc/resources/hydra-oidc-service.yaml @@ -2,13 +2,13 @@ apiVersion: v1 kind: Service metadata: labels: - io.kompose.service: hydra-oidc + app.kubernetes.io/name: hydra-oidc name: hydra-oidc spec: ports: - name: hydra-oidc port: 8080 selector: - io.kompose.service: hydra-oidc + app.kubernetes.io/name: hydra-oidc status: loadBalancer: {} diff --git a/components/hydra-saml/resources/hydra-saml-remote-user.yaml b/components/hydra-saml/resources/hydra-saml-remote-user.yaml index cf4705e..580dc75 100644 --- a/components/hydra-saml/resources/hydra-saml-remote-user.yaml +++ b/components/hydra-saml/resources/hydra-saml-remote-user.yaml @@ -2,19 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - io.kompose.service: hydra-saml-remote-user + app.kubernetes.io/name: hydra-saml-remote-user name: hydra-saml-remote-user spec: replicas: 1 selector: matchLabels: - io.kompose.service: hydra-saml-remote-user + app.kubernetes.io/name: hydra-saml-remote-user strategy: type: Recreate template: metadata: labels: - io.kompose.service: hydra-saml-remote-user + app.kubernetes.io/name: hydra-saml-remote-user spec: containers: - name: hydra-saml-remote-user @@ -31,7 +31,7 @@ apiVersion: v1 kind: Service metadata: labels: - io.kompose.service: hydra-saml-remote-user + app.kubernetes.io/name: hydra-saml-remote-user name: hydra-saml-remote-user spec: ports: @@ -39,6 +39,6 @@ spec: port: 80 targetPort: 8080 selector: - io.kompose.service: hydra-saml-remote-user + app.kubernetes.io/name: hydra-saml-remote-user status: loadBalancer: {} diff --git a/components/hydra-saml/resources/hydra-saml-shibboleth-sp.yaml b/components/hydra-saml/resources/hydra-saml-shibboleth-sp.yaml index d715d34..555a73a 100644 --- a/components/hydra-saml/resources/hydra-saml-shibboleth-sp.yaml +++ b/components/hydra-saml/resources/hydra-saml-shibboleth-sp.yaml @@ -2,19 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - io.kompose.service: hydra-saml-shibboleth-sp + app.kubernetes.io/name: hydra-saml-shibboleth-sp name: hydra-saml-shibboleth-sp spec: replicas: 1 selector: matchLabels: - io.kompose.service: hydra-saml-shibboleth-sp + app.kubernetes.io/name: hydra-saml-shibboleth-sp strategy: type: Recreate template: metadata: labels: - io.kompose.service: hydra-saml-shibboleth-sp + app.kubernetes.io/name: hydra-saml-shibboleth-sp spec: securityContext: fsGroup: 102 @@ -41,14 +41,14 @@ apiVersion: v1 kind: Service metadata: labels: - io.kompose.service: hydra-saml + app.kubernetes.io/name: hydra-saml name: hydra-saml spec: ports: - name: http port: 80 selector: - io.kompose.service: hydra-saml-shibboleth-sp + app.kubernetes.io/name: hydra-saml-shibboleth-sp status: loadBalancer: {} diff --git a/components/hydra-sql/resources/hydra-sql-deployment.yaml b/components/hydra-sql/resources/hydra-sql-deployment.yaml index 0b03667..6484b14 100644 --- a/components/hydra-sql/resources/hydra-sql-deployment.yaml +++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml @@ -2,19 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - io.kompose.service: hydra-sql + app.kubernetes.io/name: hydra-sql name: hydra-sql spec: replicas: 1 selector: matchLabels: - io.kompose.service: hydra-sql + app.kubernetes.io/name: hydra-sql strategy: type: Recreate template: metadata: labels: - io.kompose.service: hydra-sql + app.kubernetes.io/name: hydra-sql spec: containers: - name: hydra-sql-fpm diff --git a/components/hydra-sql/resources/hydra-sql-service.yaml b/components/hydra-sql/resources/hydra-sql-service.yaml index 2941999..b4073c6 100644 --- a/components/hydra-sql/resources/hydra-sql-service.yaml +++ b/components/hydra-sql/resources/hydra-sql-service.yaml @@ -2,13 +2,13 @@ apiVersion: v1 kind: Service metadata: labels: - io.kompose.service: hydra-sql + app.kubernetes.io/name: hydra-sql name: hydra-sql spec: ports: - name: hydra-sql port: 8080 selector: - io.kompose.service: hydra-sql + app.kubernetes.io/name: hydra-sql status: loadBalancer: {} diff --git a/examples/authenticated-app/resources/port-forwarder.yaml b/examples/authenticated-app/resources/port-forwarder.yaml index 7db316a..d55ccf8 100644 --- a/examples/authenticated-app/resources/port-forwarder.yaml +++ b/examples/authenticated-app/resources/port-forwarder.yaml @@ -2,19 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - io.kompose.service: port-forwarder + app.kubernetes.io/name: port-forwarder name: port-forwarder spec: replicas: 1 selector: matchLabels: - io.kompose.service: port-forwarder + app.kubernetes.io/name: port-forwarder strategy: type: Recreate template: metadata: labels: - io.kompose.service: port-forwarder + app.kubernetes.io/name: port-forwarder spec: containers: - image: hpello/tcp-proxy:latest @@ -42,7 +42,7 @@ apiVersion: v1 metadata: name: ssokustom labels: - io.kompose.service: port-forwarder + app.kubernetes.io/name: port-forwarder spec: ports: - name: https @@ -52,4 +52,4 @@ spec: port: 80 targetPort: 80 selector: - io.kompose.service: port-forwarder \ No newline at end of file + app.kubernetes.io/name: port-forwarder \ No newline at end of file diff --git a/examples/authenticated-app/resources/saml-idp.yaml b/examples/authenticated-app/resources/saml-idp.yaml index d89cdbf..20146d2 100644 --- a/examples/authenticated-app/resources/saml-idp.yaml +++ b/examples/authenticated-app/resources/saml-idp.yaml @@ -2,19 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - io.kompose.service: saml-idp + app.kubernetes.io/name: saml-idp name: saml-idp spec: replicas: 1 selector: matchLabels: - io.kompose.service: saml-idp + app.kubernetes.io/name: saml-idp strategy: type: Recreate template: metadata: labels: - io.kompose.service: saml-idp + app.kubernetes.io/name: saml-idp spec: containers: - image: kristophjunge/test-saml-idp:1.15 @@ -35,7 +35,7 @@ apiVersion: v1 kind: Service metadata: labels: - io.kompose.service: saml-idp + app.kubernetes.io/name: saml-idp name: saml-idp spec: ports: @@ -46,6 +46,6 @@ spec: port: 8443 targetPort: 8443 selector: - io.kompose.service: saml-idp + app.kubernetes.io/name: saml-idp status: loadBalancer: {} \ No newline at end of file diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml index 410872c..fc314ad 100644 --- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml +++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml @@ -2,19 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - io.kompose.service: hydra-dispatcher + app.kubernetes.io/name: hydra-dispatcher name: hydra-dispatcher spec: replicas: 1 selector: matchLabels: - io.kompose.service: hydra-dispatcher + app.kubernetes.io/name: hydra-dispatcher strategy: type: Recreate template: metadata: labels: - io.kompose.service: hydra-dispatcher + app.kubernetes.io/name: hydra-dispatcher spec: containers: - name: hydra-dispatcher-php-fpm diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml index 1357a2a..4a209a3 100644 --- a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml +++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml @@ -2,13 +2,13 @@ apiVersion: v1 kind: Service metadata: labels: - io.kompose.service: hydra-dispatcher + app.kubernetes.io/name: hydra-dispatcher name: hydra-dispatcher spec: ports: - name: http port: 8080 selector: - io.kompose.service: hydra-dispatcher + app.kubernetes.io/name: hydra-dispatcher status: loadBalancer: {} diff --git a/resources/hydra/resources/hydra-deployment.yaml b/resources/hydra/resources/hydra-deployment.yaml index bf15af4..450e10d 100644 --- a/resources/hydra/resources/hydra-deployment.yaml +++ b/resources/hydra/resources/hydra-deployment.yaml @@ -2,19 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - io.kompose.service: hydra + app.kubernetes.io/name: hydra name: hydra spec: replicas: 1 selector: matchLabels: - io.kompose.service: hydra + app.kubernetes.io/name: hydra strategy: type: Recreate template: metadata: labels: - io.kompose.service: hydra + app.kubernetes.io/name: hydra spec: serviceAccountName: hydra-sa initContainers: diff --git a/resources/hydra/resources/hydra-service.yaml b/resources/hydra/resources/hydra-service.yaml index 642203d..31389bd 100644 --- a/resources/hydra/resources/hydra-service.yaml +++ b/resources/hydra/resources/hydra-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: labels: - io.kompose.service: hydra + app.kubernetes.io/name: hydra name: hydra spec: ports: @@ -13,6 +13,6 @@ spec: port: 4445 targetPort: hydra-admin selector: - io.kompose.service: hydra + app.kubernetes.io/name: hydra status: loadBalancer: {}