From 3a1ccca97d421c4b5d6d1a14478a72fa4dffc5b3 Mon Sep 17 00:00:00 2001 From: Ai Hamano Date: Fri, 7 Oct 2022 13:50:57 +0900 Subject: [PATCH] Update k8s v1.25.2 and helm 3.10.1 This patch updates the k8s version to 1.25.2 and helm version to 3.10.1. The following changes have been made in kubernetes 1.24, so this patch supports them. - Dockershim Removed from kubelet -> Changed from Dockershim to CRIO - Service account tokens are no longer auto-generated for every ServiceAccount -> Changed secrets to be created manually Also fixes the following API versions that have already been removed in kubernetes 1.25. - autoscaling/v2beta1 - extensions/v1beta1 Implements: blueprint update-k8s-helm-prometheus Change-Id: Ic9c2f66251c5d11a652184be5908d91e0ee3fb7d --- .zuul.yaml | 17 +++-- devstack/local.conf.kubernetes | 9 ++- playbooks/devstack/pre.yaml | 1 + .../files/create_admin_token.yaml | 11 +++- roles/setup-k8s-nodes/tasks/main.yaml | 24 +++++++ roles/setup-k8s-oidc/files/create_keycloak.sh | 2 +- .../kubernetes/horizontal-pod-autoscaler.yaml | 2 +- .../nfv/test_cnf/TOSCA-Metadata/TOSCA.meta | 2 +- .../Files/kubernetes/test-chart-0.1.1.tgz | Bin 3814 -> 2886 bytes .../kubernetes/test-chart/templates/NOTES.txt | 8 +-- .../test-chart/templates/deployment_vdu1.yaml | 2 - .../test-chart/templates/deployment_vdu2.yaml | 2 - .../kubernetes/test-chart/templates/hpa.yaml | 28 -------- .../test-chart/templates/ingress.yaml | 61 ------------------ .../templates/tests/test-connection.yaml | 15 ----- .../Files/kubernetes/test-chart/values.yaml | 23 ------- .../contents/TOSCA-Metadata/TOSCA.meta | 2 +- .../Files/kubernetes/test-chart-0.1.0.tgz | Bin 3809 -> 2882 bytes .../kubernetes/test-chart/templates/NOTES.txt | 8 +-- .../test-chart/templates/deployment_vdu1.yaml | 2 - .../test-chart/templates/deployment_vdu2.yaml | 2 - .../kubernetes/test-chart/templates/hpa.yaml | 28 -------- .../test-chart/templates/ingress.yaml | 61 ------------------ .../templates/tests/test-connection.yaml | 15 ----- .../Files/kubernetes/test-chart/values.yaml | 23 ------- .../contents/TOSCA-Metadata/TOSCA.meta | 2 +- .../kubernetes/horizontal-pod-autoscaler.yaml | 2 +- .../contents/TOSCA-Metadata/TOSCA.meta | 2 +- .../kubernetes/horizontal-pod-autoscaler.yaml | 2 +- .../samples/sample2/TOSCA-Metadata/TOSCA.meta | 2 +- .../horizontal-pod-autoscaler.yaml | 2 +- tools/gen_vim_config.sh | 14 ++++ 32 files changed, 79 insertions(+), 295 deletions(-) create mode 100644 roles/setup-k8s-nodes/tasks/main.yaml delete mode 100644 tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/templates/hpa.yaml delete mode 100644 tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/templates/ingress.yaml delete mode 100644 tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/templates/tests/test-connection.yaml delete mode 100644 tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/hpa.yaml delete mode 100644 tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/ingress.yaml delete mode 100644 tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/tests/test-connection.yaml diff --git a/.zuul.yaml b/.zuul.yaml index affe955ee..346469f7a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -455,12 +455,12 @@ KURYR_K8S_API_URL: "https://{{ hostvars['controller-k8s']['nodepool']['private_ipv4'] }}:${KURYR_K8S_API_PORT}" KURYR_K8S_CONTAINERIZED_DEPLOYMENT: false KURYR_NEUTRON_DEFAULT_SUBNETPOOL_ID: shared-default-subnetpool-v4 - # TODO(YiFeng): At present, the version of kubernetes should be - # 1.23.3, and the returned response can pass the verification of - # kubernetes-client (1.23.3). This configuration will be removed - # after kuryr-kubernetes fixes the following bug. - # https://bugs.launchpad.net/kuryr-kubernetes/+bug/1968960 - KURYR_KUBERNETES_VERSION: 1.23.3 + # NOTES: + # - In Atelope cycle, Kubernetes version is updated to 1.25. + # https://blueprints.launchpad.net/tacker/+spec/update-k8s-helm-prometheus + KURYR_KUBERNETES_VERSION: 1.25.2 + CONTAINER_ENGINE: crio + CRIO_VERSION: 1.25 MYSQL_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}" OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2" OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-bionic" @@ -520,7 +520,10 @@ amp_active_retries: 9999 kuryr_k8s_api_url: "https://{{ hostvars['controller-k8s']['nodepool']['private_ipv4'] }}:6443" k8s_ssl_verify: true - helm_version: "3.5.4" + # NOTES: + # - In Atelope cycle, Helm version is updated to 3.10. + # https://blueprints.launchpad.net/tacker/+spec/update-k8s-helm-prometheus + helm_version: "3.10.1" test_matrix_configs: [neutron] zuul_work_dir: src/opendev.org/openstack/tacker zuul_copy_output: diff --git a/devstack/local.conf.kubernetes b/devstack/local.conf.kubernetes index 23a3da030..ec3d1e36e 100644 --- a/devstack/local.conf.kubernetes +++ b/devstack/local.conf.kubernetes @@ -60,8 +60,15 @@ enable_service n-cauth disable_service tempest -# Enable kuryr-kubernetes, docker, octavia +# Enable kuryr-kubernetes, crio, octavia KUBERNETES_VIM=True +# It is necessary to specify the patch version +# because it is the version used when executing "apt-get install" command. +KURYR_KUBERNETES_VERSION="1.25.2" +CONTAINER_ENGINE="crio" +# It is not necessary to specify the patch version +# because it is the version used when adding the apt repository. +CRIO_VERSION="1.25" enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr-kubernetes master enable_plugin octavia https://opendev.org/openstack/octavia master enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container master diff --git a/playbooks/devstack/pre.yaml b/playbooks/devstack/pre.yaml index 20a8abbbd..034b4961c 100644 --- a/playbooks/devstack/pre.yaml +++ b/playbooks/devstack/pre.yaml @@ -1,6 +1,7 @@ - hosts: all roles: - ensure-db-cli-installed + - setup-k8s-nodes - orchestrate-devstack - modify-heat-policy - setup-k8s-oidc diff --git a/roles/setup-default-vim/files/create_admin_token.yaml b/roles/setup-default-vim/files/create_admin_token.yaml index 07060e923..c78217537 100644 --- a/roles/setup-default-vim/files/create_admin_token.yaml +++ b/roles/setup-default-vim/files/create_admin_token.yaml @@ -20,4 +20,13 @@ metadata: namespace: kube-system labels: kubernetes.io/cluster-service: "true" - addonmanager.kubernetes.io/mode: Reconcile \ No newline at end of file + addonmanager.kubernetes.io/mode: Reconcile +--- +apiVersion: v1 +kind: Secret +metadata: + name: admin-token-k8svim + namespace: kube-system + annotations: + kubernetes.io/service-account.name: "admin" +type: kubernetes.io/service-account-token diff --git a/roles/setup-k8s-nodes/tasks/main.yaml b/roles/setup-k8s-nodes/tasks/main.yaml new file mode 100644 index 000000000..2b7becfb5 --- /dev/null +++ b/roles/setup-k8s-nodes/tasks/main.yaml @@ -0,0 +1,24 @@ +- block: + - name: load kernel module + modprobe: + name: "{{ item }}" + state: present + with_items: + - overlay + - br_netfilter + become: yes + - name: configure network(iptables/ip_forward) kernel parameter + sysctl: + name: "{{ item }}" + value: '1' + sysctl_set: yes + state: present + reload: yes + with_items: + - net.bridge.bridge-nf-call-ip6tables + - net.bridge.bridge-nf-call-iptables + - net.ipv4.ip_forward + become: yes + when: + - inventory_hostname == 'controller-k8s' + - kuryr_k8s_api_url is defined diff --git a/roles/setup-k8s-oidc/files/create_keycloak.sh b/roles/setup-k8s-oidc/files/create_keycloak.sh index d354f53bc..1235bf998 100644 --- a/roles/setup-k8s-oidc/files/create_keycloak.sh +++ b/roles/setup-k8s-oidc/files/create_keycloak.sh @@ -1,6 +1,6 @@ #!/bin/bash -docker run -d \ +podman run -d \ --net=host \ -e KEYCLOAK_ADMIN=admin -e KEYCLOAK_ADMIN_PASSWORD=admin \ -e KC_HTTP_PORT=8080 -e KC_HTTPS_PORT=8443 \ diff --git a/tacker/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/horizontal-pod-autoscaler.yaml b/tacker/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/horizontal-pod-autoscaler.yaml index 53b8d9113..14aee5f29 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/horizontal-pod-autoscaler.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/horizontal-pod-autoscaler.yaml @@ -7,7 +7,7 @@ spec: maxReplicas: 3 minReplicas: 1 scaleTargetRef: - apiVersion: extensions/v1beta1 + apiVersion: apps/v1 kind: Deployment name: curry-svc-vdu001 targetCPUUtilizationPercentage: 40 diff --git a/tacker/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta index 6d590c695..a049e1aa3 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta @@ -36,7 +36,7 @@ Hash: 80f160c9bdd9daa6d0111c8d40b5575946b8c0f23696aa8d91d20f313adae087 Name: Files/kubernetes/horizontal-pod-autoscaler.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: aa95058d04ef61159712e7c567220b3f5c275251d78b0000bc04575f23c55894 +Hash: e0fcd3fe107ede4c21d436afbc28455a9c60909bf67f27886c88b379ca529e09 Name: Files/kubernetes/job.yaml Content-Type: test-data diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart-0.1.1.tgz b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart-0.1.1.tgz index 43ab2841d4021f2595a0958f8909337ca0718460..3d81b688ab79c4032179e8ab2fc339e7647c2be3 100644 GIT binary patch literal 2886 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 literal 3814 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.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "test-chart.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/templates/tests/test-connection.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/templates/tests/test-connection.yaml deleted file mode 100644 index 436cd35e6..000000000 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "test-chart.fullname" . }}-test-connection" - labels: - {{- include "test-chart.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "test-chart.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/values.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/values.yaml index ce8bf1740..5a9ba0961 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/values.yaml +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/Files/kubernetes/test-chart/values.yaml @@ -41,22 +41,6 @@ service: type: ClusterIP port: 80 -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little @@ -69,13 +53,6 @@ resources: {} # cpu: 100m # memory: 128Mi -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - nodeSelector: {} tolerations: [] diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/TOSCA-Metadata/TOSCA.meta b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/TOSCA-Metadata/TOSCA.meta index 53d6cba01..f1dffaffb 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_change_vnf_pkg/contents/TOSCA-Metadata/TOSCA.meta @@ -6,4 +6,4 @@ Entry-Definitions: Definitions/sample_cnf_top.vnfd.yaml Name: Files/kubernetes/test-chart-0.1.1.tgz Content-Type: test-data Algorithm: SHA-256 -Hash: 0af8bdd875d80896585e75f55b7fda2d291a8152e49f26816203d7d94bcdfe9f +Hash: 388dbd7b96024d9800de46dfdf9b2a9c829e9d74f256321727170d28eff2fd8b diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart-0.1.0.tgz b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart-0.1.0.tgz index 2d2e2b1b2a76ad967dd623620fc8dc5c980dd37f..8a447dc23dcb9222b720655ed86b8b75fca49e14 100644 GIT binary patch literal 2882 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 literal 3809 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 X+qP|gf%g9a00960jr+BN09*h7tXF(= diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/NOTES.txt b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/NOTES.txt index 8e5bcb8f5..1fd1f2b6a 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/NOTES.txt +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/NOTES.txt @@ -1,11 +1,5 @@ 1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} +{{- if contains "NodePort" .Values.service.type }} export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "test-chart.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/deployment_vdu1.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/deployment_vdu1.yaml index 80016074f..d3f7a31cd 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/deployment_vdu1.yaml +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/deployment_vdu1.yaml @@ -5,9 +5,7 @@ metadata: labels: {{- include "test-chart.labels" . | nindent 4 }} spec: - {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCountVdu1 }} - {{- end }} selector: matchLabels: {{- include "test-chart.selectorLabels" . | nindent 6 }} diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/deployment_vdu2.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/deployment_vdu2.yaml index a10e6af4c..b76b5daf2 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/deployment_vdu2.yaml +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/deployment_vdu2.yaml @@ -5,9 +5,7 @@ metadata: labels: {{- include "test-chart.labels" . | nindent 4 }} spec: - {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCountVdu2 }} - {{- end }} selector: matchLabels: {{- include "test-chart.selectorLabels" . | nindent 6 }} diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/hpa.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/hpa.yaml deleted file mode 100644 index cb4594c59..000000000 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "test-chart.fullname" . }} - labels: - {{- include "test-chart.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "test-chart.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/ingress.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/ingress.yaml deleted file mode 100644 index 6cf62cee3..000000000 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "test-chart.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "test-chart.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/tests/test-connection.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/tests/test-connection.yaml deleted file mode 100644 index 436cd35e6..000000000 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "test-chart.fullname" . }}-test-connection" - labels: - {{- include "test-chart.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "test-chart.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/values.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/values.yaml index ce8bf1740..5a9ba0961 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/values.yaml +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/Files/kubernetes/test-chart/values.yaml @@ -41,22 +41,6 @@ service: type: ClusterIP port: 80 -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little @@ -69,13 +53,6 @@ resources: {} # cpu: 100m # memory: 128Mi -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - nodeSelector: {} tolerations: [] diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/TOSCA-Metadata/TOSCA.meta b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/TOSCA-Metadata/TOSCA.meta index 231b8041a..23e7d736e 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_helm_instantiate/contents/TOSCA-Metadata/TOSCA.meta @@ -6,4 +6,4 @@ Entry-Definitions: Definitions/sample_cnf_top.vnfd.yaml Name: Files/kubernetes/test-chart-0.1.0.tgz Content-Type: test-data Algorithm: SHA-256 -Hash: 96851c4f3e566d7e94eaa3f7a6ada7fcede501316ffc35b0e27bfdab7f23d4fc +Hash: fa05dd35f45adb43ff1c6c77675ac82c477c5a55a3ad14a87a6b542c21cf4f7c diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/Files/kubernetes/horizontal-pod-autoscaler.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/Files/kubernetes/horizontal-pod-autoscaler.yaml index 53b8d9113..14aee5f29 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/Files/kubernetes/horizontal-pod-autoscaler.yaml +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/Files/kubernetes/horizontal-pod-autoscaler.yaml @@ -7,7 +7,7 @@ spec: maxReplicas: 3 minReplicas: 1 scaleTargetRef: - apiVersion: extensions/v1beta1 + apiVersion: apps/v1 kind: Deployment name: curry-svc-vdu001 targetCPUUtilizationPercentage: 40 diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta b/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta index 64336fdbf..744f31dcc 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta @@ -41,7 +41,7 @@ Hash: 2a83656567410141fb50086cdd3e73bd9fb9721bee444872c22338258dd076e0 Name: Files/kubernetes/horizontal-pod-autoscaler.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: aa95058d04ef61159712e7c567220b3f5c275251d78b0000bc04575f23c55894 +Hash: e0fcd3fe107ede4c21d436afbc28455a9c60909bf67f27886c88b379ca529e09 Name: Files/kubernetes/job.yaml Content-Type: test-data diff --git a/tacker/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/horizontal-pod-autoscaler.yaml b/tacker/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/horizontal-pod-autoscaler.yaml index 53b8d9113..14aee5f29 100644 --- a/tacker/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/horizontal-pod-autoscaler.yaml +++ b/tacker/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/horizontal-pod-autoscaler.yaml @@ -7,7 +7,7 @@ spec: maxReplicas: 3 minReplicas: 1 scaleTargetRef: - apiVersion: extensions/v1beta1 + apiVersion: apps/v1 kind: Deployment name: curry-svc-vdu001 targetCPUUtilizationPercentage: 40 diff --git a/tacker/tests/unit/sol_refactored/samples/sample2/TOSCA-Metadata/TOSCA.meta b/tacker/tests/unit/sol_refactored/samples/sample2/TOSCA-Metadata/TOSCA.meta index 995a16f14..32b693abf 100644 --- a/tacker/tests/unit/sol_refactored/samples/sample2/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/unit/sol_refactored/samples/sample2/TOSCA-Metadata/TOSCA.meta @@ -41,7 +41,7 @@ Hash: f8ed04536a8795af4828b2f731225abc34986f9ea30237d9652669ca57d9d217 Name: Files/kubernetes/horizontal-pod-autoscaler.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: aa95058d04ef61159712e7c567220b3f5c275251d78b0000bc04575f23c55894 +Hash: e0fcd3fe107ede4c21d436afbc28455a9c60909bf67f27886c88b379ca529e09 Name: Files/kubernetes/job.yaml Content-Type: test-data diff --git a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/horizontal-pod-autoscaler.yaml b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/horizontal-pod-autoscaler.yaml index d185fddd2..e51c38a5d 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/horizontal-pod-autoscaler.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/horizontal-pod-autoscaler.yaml @@ -7,7 +7,7 @@ spec: maxReplicas: 3 minReplicas: 1 scaleTargetRef: - apiVersion: extensions/v1beta1 + apiVersion: apps/v1 kind: Deployment name: curry-svc-vdu001 targetCPUUtilizationPercentage: 40 diff --git a/tools/gen_vim_config.sh b/tools/gen_vim_config.sh index 99f5c8839..87fb5380a 100755 --- a/tools/gen_vim_config.sh +++ b/tools/gen_vim_config.sh @@ -30,6 +30,20 @@ VIMC_DEFAULT_OUTPUT=vim_config.yaml # Secret token retrieved from kubectl. ####################################### function k8s_token() { + # NOTES: + # - Service account tokens are no longer automatically generated + # for each ServiceAccount in Kubernetes 1.24, + # so it is necessary to manually register Secret. + kubectl create -f - </dev/null +apiVersion: v1 +kind: Secret +metadata: + name: default-token-k8svim + annotations: + kubernetes.io/service-account.name: "default" +type: kubernetes.io/service-account-token +EOF + local _secret=$(kubectl get secret -o jsonpath="{.items[0].metadata.name}") echo $(kubectl get secret ${_secret} -o jsonpath="{.data.token}" | base64 --decode)